[SCM] Samba Shared Repository - branch master updated

[Jelmer Vernooij]

The branch, master has been updated
       via  1417ea1 Remove pointless exception catching in tests.
       via  d7d5858 netcmd/domain: Remove unused imports.
      from  851d662 s3-docs: Fix typo.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 1417ea1eed62e12affd9d55020eba84a4b322443
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sat Oct 8 14:34:57 2011 +0200

    Remove pointless exception catching in tests.
    
    Autobuild-User: Jelmer Vernooij <jelmer at samba.org>
    Autobuild-Date: Sun Oct  9 00:00:26 CEST 2011 on sn-devel-104

commit d7d5858b742f1502d8738111996f42c1da2bcee1
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sat Oct 8 14:34:35 2011 +0200

    netcmd/domain: Remove unused imports.

-----------------------------------------------------------------------

Summary of changes:
 source4/dsdb/tests/python/dirsync.py            |    9 +++------
 source4/dsdb/tests/python/ldap.py               |    5 +----
 source4/scripting/python/samba/netcmd/domain.py |    4 ++--
 3 files changed, 6 insertions(+), 12 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/dsdb/tests/python/dirsync.py b/source4/dsdb/tests/python/dirsync.py
index dcb10a8..6da9003 100755
--- 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 9f5b82f..2e35eec 100755
--- 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"""
diff --git a/source4/scripting/python/samba/netcmd/domain.py b/source4/scripting/python/samba/netcmd/domain.py
index 0ab35a6..f1125b2 100644
--- a/source4/scripting/python/samba/netcmd/domain.py
+++ b/source4/scripting/python/samba/netcmd/domain.py
@@ -30,7 +30,7 @@ import tempfile
 import logging
 from samba import Ldb
 from samba.net import Net, LIBNET_JOIN_AUTOMATIC
-from samba.dcerpc.misc import SEC_CHAN_WKSTA
+import samba.ntacls
 from samba.join import join_RODC, join_DC, join_subdomain
 from samba.auth import system_session
 from samba.samdb import SamDB
@@ -44,7 +44,6 @@ from samba.netcmd import (
 from samba.samba3 import Samba3
 from samba.samba3 import param as s3param
 from samba.upgrade import upgrade_from_samba3
-from samba.provision import ProvisioningError
 
 from samba.dsdb import (
     DS_DOMAIN_FUNCTION_2000,
@@ -59,6 +58,7 @@ def get_testparm_var(testparm, smbconf, varname):
     output = os.popen(cmd, 'r').readline()
     return output.strip()
 
+
 class cmd_domain_export_keytab(Command):
     """Dumps kerberos keys of the domain into a keytab"""
 


-- 
Samba Shared Repository