summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2016-04-18 14:59:21 +1200
committerAndrew Bartlett <abartlet@samba.org>2016-06-06 16:36:23 +0200
commitcccd20ff55d2aaed4fe5cf9b8727186180baf09f (patch)
treeaab569818f76f115eb2da1eb1b7ff47d4f86de85 /source4
parentf7eb865cd9e572ace6b32f1b796b0b5f113e6d5d (diff)
downloadsamba-cccd20ff55d2aaed4fe5cf9b8727186180baf09f.tar.gz
Remove the try/catch from urgent_replication.py
This meant that for ages, the duplicate OID was unnoticed, and when the syntax was corrected recently, this caused the test to run, and so cause trouble Signed-off-by: Andrew Bartlett <abartlet@samba.org> Reviewed-by: Garming Sam <garming@catalyst.net.nz
Diffstat (limited to 'source4')
-rwxr-xr-xsource4/dsdb/tests/python/urgent_replication.py14
1 files changed, 5 insertions, 9 deletions
diff --git a/source4/dsdb/tests/python/urgent_replication.py b/source4/dsdb/tests/python/urgent_replication.py
index 46aa55807a5..ec2f6d13c2b 100755
--- a/source4/dsdb/tests/python/urgent_replication.py
+++ b/source4/dsdb/tests/python/urgent_replication.py
@@ -147,9 +147,8 @@ systemFlags: 33554432""", ["relax:0"])
def test_attributeSchema_object(self):
"""Test if the urgent replication is activated when handling an attributeSchema object"""
- try:
- self.ldb.add_ldif(
- """dn: CN=test attributeSchema,cn=Schema,CN=Configuration,%s""" % self.base_dn + """
+ self.ldb.add_ldif(
+ """dn: CN=test attributeSchema,cn=Schema,CN=Configuration,%s""" % self.base_dn + """
objectClass: attributeSchema
cn: test attributeSchema
instanceType: 4
@@ -165,12 +164,9 @@ searchFlags: 8
lDAPDisplayName: testAttributeSchema
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"])
-
- except LdbError:
- print "Not testing urgent replication when creating attributeSchema object ...\n"
+ # 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"])
# urgent replication should be enabled when modifying
m = Message()