From 4bf6a3e72c9c954aa1f7ff566e30dd21d75fcfcc Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Wed, 3 Nov 2010 19:11:26 +0100 Subject: urgent_replication: Fix formatting --- source4/dsdb/tests/python/urgent_replication.py | 66 ++++++++++++------------- 1 file changed, 33 insertions(+), 33 deletions(-) (limited to 'source4/dsdb/tests') diff --git a/source4/dsdb/tests/python/urgent_replication.py b/source4/dsdb/tests/python/urgent_replication.py index af5cacaaa8..7f0956ee70 100755 --- a/source4/dsdb/tests/python/urgent_replication.py +++ b/source4/dsdb/tests/python/urgent_replication.py @@ -67,11 +67,11 @@ class UrgentReplicationTests(samba.tests.TestCase): "dn": "cn=nonurgenttest,cn=users," + self.base_dn, "objectclass":"user", "samaccountname":"nonurgenttest", - "description":"nonurgenttest description"}); + "description":"nonurgenttest description"}) # urgent replication should not be enabled when creating res = self.ldb.load_partition_usn(self.base_dn) - self.assertNotEquals(res["uSNHighest"], res["uSNUrgent"]); + self.assertNotEquals(res["uSNHighest"], res["uSNUrgent"]) # urgent replication should not be enabled when modifying m = Message() @@ -80,12 +80,12 @@ class UrgentReplicationTests(samba.tests.TestCase): "description") ldb.modify(m) res = self.ldb.load_partition_usn(self.base_dn) - self.assertNotEquals(res["uSNHighest"], res["uSNUrgent"]); + self.assertNotEquals(res["uSNHighest"], res["uSNUrgent"]) # urgent replication should not be enabled when deleting self.delete_force(self.ldb, "cn=nonurgenttest,cn=users," + self.base_dn) res = self.ldb.load_partition_usn(self.base_dn) - self.assertNotEquals(res["uSNHighest"], res["uSNUrgent"]); + self.assertNotEquals(res["uSNHighest"], res["uSNUrgent"]) def test_nTDSDSA_object(self): @@ -96,7 +96,7 @@ class UrgentReplicationTests(samba.tests.TestCase): "objectclass":"server", "cn":"test server", "name":"test server", - "systemFlags":"50000000", ["relax:0"]}); + "systemFlags":"50000000"}, ["relax:0"]) self.ldb.add_ldif( """dn: cn=NTDS Settings test,cn=test server,cn=Servers,cn=Default-First-Site-Name,cn=Sites,cn=Configuration,%s""" % (self.base_dn) + """ @@ -104,11 +104,11 @@ objectclass: nTDSDSA cn: NTDS Settings test options: 1 instanceType: 4 -systemFlags: 33554432""", ["relax:0"]); +systemFlags: 33554432""", ["relax:0"]) # urgent replication should be enabled when creation res = self.ldb.load_partition_usn("cn=Configuration," + self.base_dn) - self.assertEquals(res["uSNHighest"], res["uSNUrgent"]); + self.assertEquals(res["uSNHighest"], res["uSNUrgent"]) # urgent replication should NOT be enabled when modifying m = Message() @@ -117,12 +117,12 @@ systemFlags: 33554432""", ["relax:0"]); "options") ldb.modify(m) res = self.ldb.load_partition_usn("cn=Configuration," + self.base_dn) - self.assertNotEquals(res["uSNHighest"], res["uSNUrgent"]); + self.assertNotEquals(res["uSNHighest"], res["uSNUrgent"]) # urgent replication should be enabled when deleting self.delete_force(self.ldb, "cn=NTDS Settings test,cn=test server,cn=Servers,cn=Default-First-Site-Name,cn=Sites,cn=Configuration," + self.base_dn) res = self.ldb.load_partition_usn("cn=Configuration," + self.base_dn) - self.assertEquals(res["uSNHighest"], res["uSNUrgent"]); + self.assertEquals(res["uSNHighest"], res["uSNUrgent"]) self.delete_force(self.ldb, "cn=test server,cn=Servers,cn=Default-First-Site-Name,cn=Sites,cn=Configuration," + self.base_dn) @@ -139,11 +139,11 @@ systemFlags: 33554432""", ["relax:0"]); "nCName": self.base_dn, "showInAdvancedViewOnly": "TRUE", "name": "test crossRef", - "systemFlags": "1", ["relax:0"]}); + "systemFlags": "1", ["relax:0"]}) # urgent replication should be enabled when creating res = self.ldb.load_partition_usn("cn=Configuration," + self.base_dn) - self.assertEquals(res["uSNHighest"], res["uSNUrgent"]); + self.assertEquals(res["uSNHighest"], res["uSNUrgent"]) # urgent replication should NOT be enabled when modifying m = Message() @@ -152,13 +152,13 @@ systemFlags: 33554432""", ["relax:0"]); "systemFlags") ldb.modify(m) res = self.ldb.load_partition_usn("cn=Configuration," + self.base_dn) - self.assertNotEquals(res["uSNHighest"], res["uSNUrgent"]); + self.assertNotEquals(res["uSNHighest"], res["uSNUrgent"]) # urgent replication should be enabled when deleting self.delete_force(self.ldb, "cn=test crossRef,CN=Partitions,CN=Configuration," + self.base_dn) res = self.ldb.load_partition_usn("cn=Configuration," + self.base_dn) - self.assertEquals(res["uSNHighest"], res["uSNUrgent"]); + self.assertEquals(res["uSNHighest"], res["uSNUrgent"]) @@ -182,11 +182,11 @@ oMSyntax: 64 systemOnly: FALSE searchFlags: 8 lDAPDisplayName: test attributeSchema -name: test attributeSchema"""); +name: test attributeSchema""") # urgent replication should be enabled when creating res = self.ldb.load_partition_usn("cn=Schema,cn=Configuration," + self.base_dn) - self.assertEquals(res["uSNHighest"], res["uSNUrgent"]); + self.assertEquals(res["uSNHighest"], res["uSNUrgent"]) except LdbError: print "Not testing urgent replication when creating attributeSchema object ...\n" @@ -198,7 +198,7 @@ name: test attributeSchema"""); "lDAPDisplayName") ldb.modify(m) res = self.ldb.load_partition_usn("cn=Schema,cn=Configuration," + self.base_dn) - self.assertEquals(res["uSNHighest"], res["uSNUrgent"]); + self.assertEquals(res["uSNHighest"], res["uSNUrgent"]) def test_classSchema_object(self): @@ -225,11 +225,11 @@ systemMustContain: msDFS-SchemaMajorVersion defaultSecurityDescriptor: D:(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;DA)(A;;RPWPCRCCD CLCLORCWOWDSDDTSW;;;SY)(A;;RPLCLORC;;;AU)(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;CO) systemFlags: 16 -defaultHidingValue: TRUE"""); +defaultHidingValue: TRUE""") # urgent replication should be enabled when creating res = self.ldb.load_partition_usn("cn=Schema,cn=Configuration," + self.base_dn) - self.assertEquals(res["uSNHighest"], res["uSNUrgent"]); + self.assertEquals(res["uSNHighest"], res["uSNUrgent"]) except LdbError: print "Not testing urgent replication when creating classSchema object ...\n" @@ -241,7 +241,7 @@ defaultHidingValue: TRUE"""); "lDAPDisplayName") ldb.modify(m) res = self.ldb.load_partition_usn("cn=Schema,cn=Configuration," + self.base_dn) - self.assertEquals(res["uSNHighest"], res["uSNUrgent"]); + self.assertEquals(res["uSNHighest"], res["uSNUrgent"]) def test_secret_object(self): @@ -253,11 +253,11 @@ defaultHidingValue: TRUE"""); "objectClass":"secret", "cn":"test secret", "name":"test secret", - "currentValue":"xxxxxxx"}, ["relax:0"]); + "currentValue":"xxxxxxx"}, ["relax:0"]) # urgent replication should be enabled when creating res = self.ldb.load_partition_usn(self.base_dn) - self.assertEquals(res["uSNHighest"], res["uSNUrgent"]); + self.assertEquals(res["uSNHighest"], res["uSNUrgent"]) # urgent replication should be enabled when modifying m = Message() @@ -266,12 +266,12 @@ defaultHidingValue: TRUE"""); "currentValue") ldb.modify(m) res = self.ldb.load_partition_usn(self.base_dn) - self.assertEquals(res["uSNHighest"], res["uSNUrgent"]); + self.assertEquals(res["uSNHighest"], res["uSNUrgent"]) # urgent replication should NOT be enabled when deleting self.delete_force(self.ldb, "cn=test secret,cn=System," + self.base_dn) res = self.ldb.load_partition_usn(self.base_dn) - self.assertNotEquals(res["uSNHighest"], res["uSNUrgent"]); + self.assertNotEquals(res["uSNHighest"], res["uSNUrgent"]) def test_rIDManager_object(self): @@ -290,7 +290,7 @@ rIDAvailablePool: 133001-1073741823""", ["relax:0"]) # urgent replication should be enabled when creating res = self.ldb.load_partition_usn(self.base_dn) - self.assertEquals(res["uSNHighest"], res["uSNUrgent"]); + self.assertEquals(res["uSNHighest"], res["uSNUrgent"]) # urgent replication should be enabled when modifying m = Message() @@ -299,12 +299,12 @@ rIDAvailablePool: 133001-1073741823""", ["relax:0"]) "systemFlags") ldb.modify(m) res = self.ldb.load_partition_usn(self.base_dn) - self.assertEquals(res["uSNHighest"], res["uSNUrgent"]); + self.assertEquals(res["uSNHighest"], res["uSNUrgent"]) # urgent replication should NOT be enabled when deleting self.delete_force(self.ldb, "CN=RID Manager test,CN=System," + self.base_dn) res = self.ldb.load_partition_usn(self.base_dn) - self.assertNotEquals(res["uSNHighest"], res["uSNUrgent"]); + self.assertNotEquals(res["uSNHighest"], res["uSNUrgent"]) def test_urgent_attributes(self): @@ -318,11 +318,11 @@ rIDAvailablePool: 133001-1073741823""", ["relax:0"]) "userAccountControl":"1", "lockoutTime":"0", "pwdLastSet":"0", - "description":"urgent attributes test description"}); + "description":"urgent attributes test description"}) # urgent replication should NOT be enabled when creating res = self.ldb.load_partition_usn(self.base_dn) - self.assertNotEquals(res["uSNHighest"], res["uSNUrgent"]); + self.assertNotEquals(res["uSNHighest"], res["uSNUrgent"]) # urgent replication should be enabled when modifying userAccountControl m = Message() @@ -331,7 +331,7 @@ rIDAvailablePool: 133001-1073741823""", ["relax:0"]) "userAccountControl") ldb.modify(m) res = self.ldb.load_partition_usn(self.base_dn) - self.assertEquals(res["uSNHighest"], res["uSNUrgent"]); + self.assertEquals(res["uSNHighest"], res["uSNUrgent"]) # urgent replication should be enabled when modifying lockoutTime m = Message() @@ -340,7 +340,7 @@ rIDAvailablePool: 133001-1073741823""", ["relax:0"]) "lockoutTime") ldb.modify(m) res = self.ldb.load_partition_usn(self.base_dn) - self.assertEquals(res["uSNHighest"], res["uSNUrgent"]); + self.assertEquals(res["uSNHighest"], res["uSNUrgent"]) # urgent replication should be enabled when modifying pwdLastSet m = Message() @@ -349,7 +349,7 @@ rIDAvailablePool: 133001-1073741823""", ["relax:0"]) "pwdLastSet") ldb.modify(m) res = self.ldb.load_partition_usn(self.base_dn) - self.assertEquals(res["uSNHighest"], res["uSNUrgent"]); + self.assertEquals(res["uSNHighest"], res["uSNUrgent"]) # urgent replication should NOT be enabled when modifying a not-urgent # attribute @@ -359,12 +359,12 @@ rIDAvailablePool: 133001-1073741823""", ["relax:0"]) FLAG_MOD_REPLACE, "description") ldb.modify(m) res = self.ldb.load_partition_usn(self.base_dn) - self.assertNotEquals(res["uSNHighest"], res["uSNUrgent"]); + self.assertNotEquals(res["uSNHighest"], res["uSNUrgent"]) # urgent replication should NOT be enabled when deleting self.delete_force(self.ldb, "cn=user UrgAttr test,cn=users," + self.base_dn) res = self.ldb.load_partition_usn(self.base_dn) - self.assertNotEquals(res["uSNHighest"], res["uSNUrgent"]); + self.assertNotEquals(res["uSNHighest"], res["uSNUrgent"]) if not "://" in host: -- cgit