sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-02 00:22:11 +03:00
Code Activity

sec_descriptor test: Simplify, use samba.tests.subunitrun module.

Browse Source 
Change-Id: I4ffda49cf3e209eaa28fc83f6fd9ded47f0ad7ee
Signed-Off-By: Jelmer Vernooij <jelmer@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Jelmer Vernooij
2014-11-02 08:23:36 -08:00
parent ee281c61d0
commit 21280da0d6
3 changed files with 14 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
source4/dsdb/tests/python/sec_descriptor.py
View File

@ -142,12 +142,13 @@ showInAdvancedViewOnly: TRUE
def setUp(self):
super(DescriptorTests, self).setUp()
self.ldb_admin = ldb
self.base_dn = ldb.domain_dn()
self.ldb_admin = SamDB(host, credentials=creds, session_info=system_session(lp), lp=lp,
options=ldb_options)
self.base_dn = self.ldb_admin.domain_dn()
self.configuration_dn = self.ldb_admin.get_config_basedn().get_linearized()
self.schema_dn = self.ldb_admin.get_schema_basedn().get_linearized()
self.domain_sid = security.dom_sid(self.ldb_admin.get_domain_sid())
self.sd_utils = sd_utils.SDUtils(ldb)
self.sd_utils = sd_utils.SDUtils(self.ldb_admin)
print "baseDN: %s" % self.base_dn
################################################################################################
@ -2173,22 +2174,15 @@ if not "://" in host:
if host.lower().startswith("ldap://"):
ldb_options = ["modules:paged_searches"]
ldb = SamDB(host,
credentials=creds,
session_info=system_session(lp),
lp=lp,
options=ldb_options)
runner = SubunitTestRunner()
rc = 0
if not runner.run(unittest.makeSuite(OwnerGroupDescriptorTests)).wasSuccessful():
rc = 1
if not runner.run(unittest.makeSuite(DaclDescriptorTests)).wasSuccessful():
rc = 1
if not runner.run(unittest.makeSuite(SdFlagsDescriptorTests)).wasSuccessful():
rc = 1
if not runner.run(unittest.makeSuite(RightsAttributesTests)).wasSuccessful():
rc = 1
if not runner.run(unittest.makeSuite(SdAutoInheritTests)).wasSuccessful():
suite = unittest.TestSuite()
suite.addTests(unittest.makeSuite(OwnerGroupDescriptorTests))
suite.addTests(unittest.makeSuite(DaclDescriptorTests))
suite.addTests(unittest.makeSuite(SdFlagsDescriptorTests))
suite.addTests(unittest.makeSuite(RightsAttributesTests))
suite.addTests(unittest.makeSuite(SdAutoInheritTests))
if not runner.run(suite).wasSuccessful():
rc = 1
else:
rc = 0
sys.exit(rc)