Remove pointless exception catching in tests.

Autobuild-User: Jelmer Vernooij <jelmer@samba.org>
Autobuild-Date: Sun Oct  9 00:00:26 CEST 2011 on sn-devel-104

diff --git a/source4/dsdb/tests/python/dirsync.py b/source4/dsdb/tests/python/dirsync.py
index dcb10a804408570a446c30f8cba594c543b87ebf..6da9003bf5660b02e7fb99a04a7aac13b5408a8d 100755 (executable)
--- a/source4/dsdb/tests/python/dirsync.py
+++ b/source4/dsdb/tests/python/dirsync.py
@@ -165,12 +165,9 @@ class SimpleDirsyncTests(DirsyncBaseTests):
 
     def test_ok_not_rootdc(self):
         """Test if it's ok to do dirsync on another NC that is not the root DC"""
-        try:
-            res = self.ldb_admin.search(self.ldb_admin.get_config_basedn(),
-                                        expression="samaccountname=*",
-                                        controls=["dirsync:1:0:1"])
-        except:
-            self.assertTrue(False)
+        self.ldb_admin.search(self.ldb_admin.get_config_basedn(),
+                                    expression="samaccountname=*",
+                                    controls=["dirsync:1:0:1"])
 
     def test_dirsync_errors(self):
         """Test if dirsync returns the correct LDAP errors in case of pb"""

diff --git a/source4/dsdb/tests/python/ldap.py b/source4/dsdb/tests/python/ldap.py
index 9f5b82f5cb80b4696f608932416a5df61a29a58e..2e35eec10af7a5a24b701d29cb1383f71756a82a 100755 (executable)
--- a/source4/dsdb/tests/python/ldap.py
+++ b/source4/dsdb/tests/python/ldap.py
@@ -2658,10 +2658,7 @@ nTSecurityDescriptor:: """ + desc_base64
                               controls=["paged_results:1:10"])
         self.assertEquals(len(res.controls), 1)
         self.assertEquals(res.controls[0].oid, "1.2.840.113556.1.4.319")
-        try:
-            s = str(res.controls[0])
-        except:
-            self.assertFalse(True)
+        s = str(res.controls[0])
 
     def test_operational(self):
         """Tests operational attributes"""