s4-repl_schema: fixed ldb exception handling
authorAndrew Tridgell <tridge@samba.org>
Mon, 29 Nov 2010 03:16:18 +0000 (14:16 +1100)
committerAndrew Tridgell <tridge@samba.org>
Mon, 29 Nov 2010 07:04:42 +0000 (18:04 +1100)
source4/torture/drs/python/repl_schema.py

index 1d94b0fdec5507bc6255a2ab233cce75c1825327..55e653b824869b70cd6d60b70b67b1dc34bf4dfd 100644 (file)
@@ -164,8 +164,10 @@ class DrsReplSchemaTestCase(samba.tests.TestCase):
             res_dc2 = self.ldb_dc2.search(base=obj_dn,
                                           scope=SCOPE_BASE,
                                           attrs=["*"])
-        except LdbError, (ERR_NO_SUCH_OBJECT, _):
-            self.fail("%s doesn't exists on %s" % (obj_dn, self.dnsname_dc2))
+        except LdbError, (enum, estr):
+            if enum == ERR_NO_SUCH_OBJECT:
+                self.fail("%s doesn't exists on %s" % (obj_dn, self.dnsname_dc2))
+            raise
         self.assertEquals(len(res_dc2), 1,
                           "%s doesn't exists on %s" % (obj_dn, self.dnsname_dc2))