General cleanups of python code, hinted by pyflakes.

source4/scripting/python/samba/tests/dcerpc/sam.py

@@ -39,6 +39,7 @@ class SamrTests(RpcInterfaceTestCase):
 
     def test_connect2(self):
         handle = self.conn.Connect2(None, security.SEC_FLAG_MAXIMUM_ALLOWED)
+        self.assertTrue(handle is not None)
 
     def test_EnumDomains(self):
         handle = self.conn.Connect2(None, security.SEC_FLAG_MAXIMUM_ALLOWED)

source4/scripting/python/samba/tests/provision.py

@@ -20,8 +20,6 @@
 import os
 from samba.provision import setup_secretsdb, findnss
 import samba.tests
-from ldb import Dn
-from samba import param
 import unittest
 
 lp = samba.tests.cmdline_loadparm

source4/scripting/python/samba/tests/samba3.py

@@ -200,17 +200,8 @@ class IdmapDbTestCase(unittest.TestCase):
         self.idmapdb.close()
 
 
-class ShareInfoTestCase(unittest.TestCase):
-    def setUp(self):
-        self.shareinfodb = ShareInfoDatabase(os.path.join(DATADIR, "share_info.tdb"))
-
-    # FIXME: needs proper data so it can be tested
-
-    def tearDown(self):
-        self.shareinfodb.close()
-
-
 class ParamTestCase(unittest.TestCase):
+
     def test_init(self):
         file = ParamFile()
         self.assertTrue(file is not None)

source4/scripting/python/samba/tests/samdb.py

@@ -17,13 +17,10 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 from samba.auth import system_session
-from samba.credentials import Credentials
 import os
 from samba.provision import setup_samdb, guess_names, make_smbconf, find_setup_dir
-from samba.samdb import SamDB
 from samba.tests import TestCaseInTempDir
 from samba.dcerpc import security
-from unittest import TestCase
 import uuid
 from samba import param
 
@@ -48,7 +45,6 @@ class SamDBTestCase(TestCaseInTempDir):
         domainguid = str(uuid.uuid4())
         policyguid = str(uuid.uuid4())
         domainsid = security.random_sid()
-        hostguid = str(uuid.uuid4())
         path = os.path.join(self.tempdir, "samdb.ldb")
         session_info = system_session()
         

source4/scripting/python/samba/tests/upgrade.py

@@ -17,7 +17,6 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-from samba import Ldb
 from samba.upgrade import import_wins
 from samba.tests import LdbTestCase