X-Git-Url: http://git.samba.org/samba.git/?a=blobdiff_plain;f=source4%2Fdsdb%2Ftests%2Fpython%2Fdirsync.py;h=474cd45f5658877cbff902cf812105e6cad9b974;hb=e940e4cd48fa866cdb81e38d7786aac953f30bdf;hp=71ea23f05e8ce654bdd48473ddb8d9daf164ded4;hpb=12d3fbe15cb58b57c60499103101e3a845378859;p=sfrench%2Fsamba-autobuild%2F.git diff --git a/source4/dsdb/tests/python/dirsync.py b/source4/dsdb/tests/python/dirsync.py index 71ea23f05e8..474cd45f565 100755 --- a/source4/dsdb/tests/python/dirsync.py +++ b/source4/dsdb/tests/python/dirsync.py @@ -73,6 +73,7 @@ creds = credopts.get_credentials(lp) # Tests start here # + class DirsyncBaseTests(samba.tests.TestCase): def setUp(self): @@ -83,7 +84,7 @@ class DirsyncBaseTests(samba.tests.TestCase): self.user_pass = samba.generate_random_password(12, 16) self.configuration_dn = self.ldb_admin.get_config_basedn().get_linearized() self.sd_utils = sd_utils.SDUtils(self.ldb_admin) - #used for anonymous login + # used for anonymous login print("baseDN: %s" % self.base_dn) def get_user_dn(self, name): @@ -98,12 +99,12 @@ class DirsyncBaseTests(samba.tests.TestCase): creds_tmp.set_workstation(creds.get_workstation()) creds_tmp.set_gensec_features(creds_tmp.get_gensec_features() | gensec.FEATURE_SEAL) - creds_tmp.set_kerberos_state(DONT_USE_KERBEROS) # kinit is too expensive to use in a tight loop + creds_tmp.set_kerberos_state(DONT_USE_KERBEROS) # kinit is too expensive to use in a tight loop ldb_target = SamDB(url=ldaphost, credentials=creds_tmp, lp=lp) return ldb_target -#tests on ldap add operations +# tests on ldap add operations class SimpleDirsyncTests(DirsyncBaseTests): def setUp(self): @@ -141,7 +142,7 @@ class SimpleDirsyncTests(DirsyncBaseTests): except Exception: pass - #def test_dirsync_errors(self): + # def test_dirsync_errors(self): def test_dirsync_supported(self): """Test the basic of the dirsync is supported""" @@ -228,19 +229,19 @@ class SimpleDirsyncTests(DirsyncBaseTests): expression="samaccountname=*", controls=["dirsync:1:0:1"]) # Check that nTSecurityDescriptor is returned as it's the case when doing dirsync - self.assertTrue(res.msgs[0].get("ntsecuritydescriptor") != None) + self.assertTrue(res.msgs[0].get("ntsecuritydescriptor") is not None) # Check that non replicated attributes are not returned - self.assertTrue(res.msgs[0].get("badPwdCount") == None) + self.assertTrue(res.msgs[0].get("badPwdCount") is None) # Check that non forward link are not returned - self.assertTrue(res.msgs[0].get("memberof") == None) + self.assertTrue(res.msgs[0].get("memberof") is None) # Asking for instanceType will return also objectGUID res = self.ldb_admin.search(self.base_dn, expression="samaccountname=Administrator", attrs=["instanceType"], controls=["dirsync:1:0:1"]) - self.assertTrue(res.msgs[0].get("objectGUID") != None) - self.assertTrue(res.msgs[0].get("instanceType") != None) + self.assertTrue(res.msgs[0].get("objectGUID") is not None) + self.assertTrue(res.msgs[0].get("instanceType") is not None) # We don't return an entry if asked for objectGUID res = self.ldb_admin.search(self.base_dn, @@ -254,10 +255,10 @@ class SimpleDirsyncTests(DirsyncBaseTests): expression="(distinguishedName=%s)" % str(self.base_dn), attrs=["name"], controls=["dirsync:1:0:1"]) - self.assertTrue(res.msgs[0].get("objectGUID") != None) - self.assertTrue(res.msgs[0].get("name") != None) - self.assertTrue(res.msgs[0].get("parentGUID") == None) - self.assertTrue(res.msgs[0].get("instanceType") != None) + self.assertTrue(res.msgs[0].get("objectGUID") is not None) + self.assertTrue(res.msgs[0].get("name") is not None) + self.assertTrue(res.msgs[0].get("parentGUID") is None) + self.assertTrue(res.msgs[0].get("instanceType") is not None) # Asking for name will return also objectGUID and parentGUID # and instanceType and of course name @@ -265,10 +266,10 @@ class SimpleDirsyncTests(DirsyncBaseTests): expression="samaccountname=Administrator", attrs=["name"], controls=["dirsync:1:0:1"]) - self.assertTrue(res.msgs[0].get("objectGUID") != None) - self.assertTrue(res.msgs[0].get("name") != None) - self.assertTrue(res.msgs[0].get("parentGUID") != None) - self.assertTrue(res.msgs[0].get("instanceType") != None) + self.assertTrue(res.msgs[0].get("objectGUID") is not None) + self.assertTrue(res.msgs[0].get("name") is not None) + self.assertTrue(res.msgs[0].get("parentGUID") is not None) + self.assertTrue(res.msgs[0].get("instanceType") is not None) # Asking for dn will not return not only DN but more like if attrs=* # parentGUID should be returned @@ -365,14 +366,13 @@ class SimpleDirsyncTests(DirsyncBaseTests): controls=["dirsync:1:0:0"]) self.assertEqual(len(res.msgs), nb - 1) if nb > 1: - self.assertTrue(res.msgs[0].get("objectGUID") != None) + self.assertTrue(res.msgs[0].get("objectGUID") is not None) else: res = self.ldb_admin.search(self.base_dn, expression="(objectclass=configuration)", attrs=["objectGUID"], controls=["dirsync:1:0:0"]) - def test_dirsync_send_delta(self): """Check that dirsync return correct delta when sending the last cookie""" res = self.ldb_admin.search(self.base_dn, @@ -454,8 +454,8 @@ class SimpleDirsyncTests(DirsyncBaseTests): expression="(&(objectClass=organizationalUnit)(!(isDeleted=*)))", controls=[control3]) - self.assertTrue(res[0].get("parentGUID") != None) - self.assertTrue(res[0].get("name") != None) + self.assertTrue(res[0].get("parentGUID") is not None) + self.assertTrue(res[0].get("name") is not None) delete_force(self.ldb_admin, ouname) def test_dirsync_linkedattributes(self): @@ -540,8 +540,6 @@ class SimpleDirsyncTests(DirsyncBaseTests): self.ldb_admin.deletegroup("testgroup") self.assertEqual(len(res[0].get("member")), 0) - - def test_dirsync_deleted_items(self): """Check that dirsync returnd deleted objects too""" # Let's create an OU @@ -573,7 +571,7 @@ class SimpleDirsyncTests(DirsyncBaseTests): guid2 = str(ndr_unpack(misc.GUID, res[0].get("objectGUID")[0])) self.assertEqual(guid2, guid) self.assertTrue(res[0].get("isDeleted")) - self.assertTrue(res[0].get("name") != None) + self.assertTrue(res[0].get("name") is not None) def test_cookie_from_others(self): res = self.ldb_admin.search(self.base_dn, @@ -598,7 +596,7 @@ class ExtendedDirsyncTests(SimpleDirsyncTests): expression="(name=Administrators)", controls=["dirsync:1:%d:1" % flag_incr_linked]) - self.assertTrue(res[0].get("member;range=1-1") != None) + self.assertTrue(res[0].get("member;range=1-1") is not None) self.assertTrue(len(res[0].get("member;range=1-1")) > 0) size = len(res[0].get("member;range=1-1")) @@ -612,7 +610,6 @@ class ExtendedDirsyncTests(SimpleDirsyncTests): self.ldb_admin.add_remove_group_members("Administrators", [self.dirsync_user], add_members_operation=True) - res = self.ldb_admin.search(self.base_dn, expression="(name=Administrators)", controls=[control1]) @@ -676,7 +673,7 @@ class ExtendedDirsyncTests(SimpleDirsyncTests): if str(e["name"]) == "testou3": guid = str(ndr_unpack(misc.GUID, e.get("objectGUID")[0])) - self.assertTrue(guid != None) + self.assertTrue(guid is not None) ctl = str(res.controls[0]).split(":") ctl[1] = "1" ctl[2] = "1"