diff options
| -rwxr-xr-x | auth/credentials/tests/bind.py | 4 | ||||
| -rwxr-xr-x | source4/dsdb/tests/python/deletetest.py | 3 | ||||
| -rwxr-xr-x | source4/dsdb/tests/python/ldap.py | 4 | ||||
| -rwxr-xr-x | source4/dsdb/tests/python/ldap_schema.py | 6 | ||||
| -rw-r--r-- | source4/dsdb/tests/python/ldap_syntaxes.py | 2 | ||||
| -rwxr-xr-x | source4/dsdb/tests/python/sam.py | 2 | ||||
| -rw-r--r-- | source4/lib/policy/tests/python/bindings.py | 4 |
7 files changed, 13 insertions, 12 deletions
diff --git a/auth/credentials/tests/bind.py b/auth/credentials/tests/bind.py index 1529a475c7..aa4b17aaff 100755 --- a/auth/credentials/tests/bind.py +++ b/auth/credentials/tests/bind.py @@ -25,10 +25,10 @@ from samba.auth import system_session from samba import gensec from samba.samdb import SamDB from samba.credentials import Credentials -import samba.tests +import samba.tests, unittest from samba.tests import delete_force from subunit.run import SubunitTestRunner -import unittest +from samba.tests import TestCase, TestSkipped parser = optparse.OptionParser("ldap [options] <host>") sambaopts = options.SambaOptions(parser) diff --git a/source4/dsdb/tests/python/deletetest.py b/source4/dsdb/tests/python/deletetest.py index 80c6937483..ce972ab7cf 100755 --- a/source4/dsdb/tests/python/deletetest.py +++ b/source4/dsdb/tests/python/deletetest.py @@ -40,13 +40,14 @@ host = args[0] lp = sambaopts.get_loadparm() creds = credopts.get_credentials(lp) -class BasicDeleteTests(unittest.TestCase): +class BasicDeleteTests(samba.tests.TestCase): def GUID_string(self, guid): return self.ldb.schema_format_value("objectGUID", guid) def setUp(self): + super(BasicDeleteTests, self).setUp() self.ldb = ldb self.base_dn = ldb.domain_dn() self.configuration_dn = ldb.get_config_basedn().get_linearized() diff --git a/source4/dsdb/tests/python/ldap.py b/source4/dsdb/tests/python/ldap.py index 9009c74e52..61443ef7a5 100755 --- a/source4/dsdb/tests/python/ldap.py +++ b/source4/dsdb/tests/python/ldap.py @@ -60,7 +60,7 @@ host = args[0] lp = sambaopts.get_loadparm() creds = credopts.get_credentials(lp) -class BasicTests(unittest.TestCase): +class BasicTests(samba.tests.TestCase): def setUp(self): super(BasicTests, self).setUp() @@ -2768,7 +2768,7 @@ nTSecurityDescriptor:: """ + desc_base64 self.assertTrue("whenCreated" in res[0]) self.assertTrue("whenChanged" in res[0]) -class BaseDnTests(unittest.TestCase): +class BaseDnTests(samba.tests.TestCase): def setUp(self): super(BaseDnTests, self).setUp() diff --git a/source4/dsdb/tests/python/ldap_schema.py b/source4/dsdb/tests/python/ldap_schema.py index a6503e2639..5de0479ff1 100755 --- a/source4/dsdb/tests/python/ldap_schema.py +++ b/source4/dsdb/tests/python/ldap_schema.py @@ -48,7 +48,7 @@ lp = sambaopts.get_loadparm() creds = credopts.get_credentials(lp) -class SchemaTests(unittest.TestCase): +class SchemaTests(samba.tests.TestCase): def setUp(self): super(SchemaTests, self).setUp() @@ -246,7 +246,7 @@ instanceType: 4 delete_force(self.ldb, "ou=%s,%s" % (object_name, self.base_dn)) -class SchemaTests_msDS_IntId(unittest.TestCase): +class SchemaTests_msDS_IntId(samba.tests.TestCase): def setUp(self): super(SchemaTests_msDS_IntId, self).setUp() @@ -518,7 +518,7 @@ systemOnly: FALSE self.assertTrue("msDS-IntId" not in ldb_msg) -class SchemaTests_msDS_isRODC(unittest.TestCase): +class SchemaTests_msDS_isRODC(samba.tests.TestCase): def setUp(self): super(SchemaTests_msDS_isRODC, self).setUp() diff --git a/source4/dsdb/tests/python/ldap_syntaxes.py b/source4/dsdb/tests/python/ldap_syntaxes.py index 64e0c421c1..ad89cb1f38 100644 --- a/source4/dsdb/tests/python/ldap_syntaxes.py +++ b/source4/dsdb/tests/python/ldap_syntaxes.py @@ -44,7 +44,7 @@ lp = sambaopts.get_loadparm() creds = credopts.get_credentials(lp) -class SyntaxTests(unittest.TestCase): +class SyntaxTests(samba.tests.TestCase): def setUp(self): super(SyntaxTests, self).setUp() diff --git a/source4/dsdb/tests/python/sam.py b/source4/dsdb/tests/python/sam.py index b08fba5a7d..7f5b74dd18 100755 --- a/source4/dsdb/tests/python/sam.py +++ b/source4/dsdb/tests/python/sam.py @@ -63,7 +63,7 @@ host = args[0] lp = sambaopts.get_loadparm() creds = credopts.get_credentials(lp) -class SamTests(unittest.TestCase): +class SamTests(samba.tests.TestCase): def setUp(self): super(SamTests, self).setUp() diff --git a/source4/lib/policy/tests/python/bindings.py b/source4/lib/policy/tests/python/bindings.py index b872d99cef..afe85196c3 100644 --- a/source4/lib/policy/tests/python/bindings.py +++ b/source4/lib/policy/tests/python/bindings.py @@ -21,10 +21,10 @@ """ -import unittest +import samba from samba import policy -class PolicyTests(unittest.TestCase): +class PolicyTests(samba.tests.TestCase): def test_get_gpo_flags(self): self.assertEquals(["GPO_FLAG_USER_DISABLE"], |