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)
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()
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()
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()
creds = credopts.get_credentials(lp)
-class SchemaTests(unittest.TestCase):
+class SchemaTests(samba.tests.TestCase):
def setUp(self):
super(SchemaTests, self).setUp()
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()
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()
creds = credopts.get_credentials(lp)
-class SyntaxTests(unittest.TestCase):
+class SyntaxTests(samba.tests.TestCase):
def setUp(self):
super(SyntaxTests, self).setUp()
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()
"""
-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"],