python: Use samba.tests.TestCase, make sure base class tearDown and

setUp methods are called, fix formatting.

7 files changed, 20 insertions, 16 deletions

diff --git a/source4/scripting/python/samba/tests/dcerpc/__init__.py b/source4/scripting/python/samba/tests/dcerpc/__init__.py
index c64c9dc9f6..e2b9b3f001 100644
--- a/source4/scripting/python/samba/tests/dcerpc/__init__.py
+++ b/source4/scripting/python/samba/tests/dcerpc/__init__.py
@@ -16,5 +16,5 @@
 #   
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
+
 
diff --git a/source4/scripting/python/samba/tests/dcerpc/bare.py b/source4/scripting/python/samba/tests/dcerpc/bare.py
index e6811b0a3d..4051052b0c 100644
--- a/source4/scripting/python/samba/tests/dcerpc/bare.py
+++ b/source4/scripting/python/samba/tests/dcerpc/bare.py
@@ -19,31 +19,32 @@
 #
 
 from samba.dcerpc import ClientConnection
-from unittest import TestCase
-from samba.tests import env_loadparm
+import samba.tests
 
-
-class BareTestCase(TestCase):
+class BareTestCase(samba.tests.TestCase):
 
     def test_bare(self):
         # Connect to the echo pipe
         x = ClientConnection("ncalrpc:localhost[DEFAULT]", 
-                ("60a15ec5-4de8-11d7-a637-005056a20182", 1), lp_ctx=env_loadparm())
+                ("60a15ec5-4de8-11d7-a637-005056a20182", 1),
+                lp_ctx=samba.tests.env_loadparm())
         self.assertEquals("\x01\x00\x00\x00", x.request(0, chr(0) * 4))
 
     def test_alter_context(self):
         x = ClientConnection("ncalrpc:localhost[DEFAULT]", 
-                ("12345778-1234-abcd-ef00-0123456789ac", 1), lp_ctx=env_loadparm())
+                ("12345778-1234-abcd-ef00-0123456789ac", 1),
+                lp_ctx=samba.tests.env_loadparm())
         y = ClientConnection("ncalrpc:localhost", 
                 ("60a15ec5-4de8-11d7-a637-005056a20182", 1),
-                basis_connection=x, lp_ctx=env_loadparm())
+                basis_connection=x, lp_ctx=samba.tests.env_loadparm())
         x.alter_context(("60a15ec5-4de8-11d7-a637-005056a20182", 1))
         # FIXME: self.assertEquals("\x01\x00\x00\x00", x.request(0, chr(0) * 4))
 
     def test_two_connections(self):
         x = ClientConnection("ncalrpc:localhost[DEFAULT]", 
-                ("60a15ec5-4de8-11d7-a637-005056a20182", 1), lp_ctx=env_loadparm())
+                ("60a15ec5-4de8-11d7-a637-005056a20182", 1), 
+                lp_ctx=samba.tests.env_loadparm())
         y = ClientConnection("ncalrpc:localhost", 
                 ("60a15ec5-4de8-11d7-a637-005056a20182", 1),
-                basis_connection=x, lp_ctx=env_loadparm())
+                basis_connection=x, lp_ctx=samba.tests.env_loadparm())
         self.assertEquals("\x01\x00\x00\x00", y.request(0, chr(0) * 4))
diff --git a/source4/scripting/python/samba/tests/dcerpc/misc.py b/source4/scripting/python/samba/tests/dcerpc/misc.py
index ab76efc536..2adf86aa9e 100644
--- a/source4/scripting/python/samba/tests/dcerpc/misc.py
+++ b/source4/scripting/python/samba/tests/dcerpc/misc.py
@@ -17,13 +17,13 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-import unittest
 from samba.dcerpc import misc
+import samba.tests
 
 text1 = "76f53846-a7c2-476a-ae2c-20e2b80d7b34"
 text2 = "344edffa-330a-4b39-b96e-2c34da52e8b1"
 
-class GUIDTests(unittest.TestCase):
+class GUIDTests(samba.tests.TestCase):
 
     def test_str(self):
         guid = misc.GUID(text1)
@@ -45,7 +45,7 @@ class GUIDTests(unittest.TestCase):
         self.assertEquals(guid1, guid2)
          
         
-class PolicyHandleTests(unittest.TestCase):
+class PolicyHandleTests(samba.tests.TestCase):
 
     def test_init(self):
         x = misc.policy_handle(text1, 1)
diff --git a/source4/scripting/python/samba/tests/dcerpc/registry.py b/source4/scripting/python/samba/tests/dcerpc/registry.py
index f1cd83790d..5ff256ed01 100644
--- a/source4/scripting/python/samba/tests/dcerpc/registry.py
+++ b/source4/scripting/python/samba/tests/dcerpc/registry.py
@@ -24,6 +24,7 @@ from samba.tests import RpcInterfaceTestCase
 class WinregTests(RpcInterfaceTestCase):
 
     def setUp(self):
+        super(WinregTests, self).setUp()
         self.conn = winreg.winreg("ncalrpc:", self.get_loadparm(), 
                                   self.get_credentials())
 
diff --git a/source4/scripting/python/samba/tests/dcerpc/rpcecho.py b/source4/scripting/python/samba/tests/dcerpc/rpcecho.py
index 72eb87d750..f1f765c990 100644
--- a/source4/scripting/python/samba/tests/dcerpc/rpcecho.py
+++ b/source4/scripting/python/samba/tests/dcerpc/rpcecho.py
@@ -19,13 +19,13 @@
 
 from samba.dcerpc import echo
 from samba.ndr import ndr_pack, ndr_unpack
-import unittest
-from samba.tests import RpcInterfaceTestCase
+from samba.tests import RpcInterfaceTestCase, TestCase
 
 
 class RpcEchoTests(RpcInterfaceTestCase):
 
     def setUp(self):
+        super(RpcEchoTests, self).setUp()
         self.conn = echo.rpcecho("ncalrpc:", self.get_loadparm())
 
     def test_two_contexts(self):
@@ -59,7 +59,7 @@ class RpcEchoTests(RpcInterfaceTestCase):
         self.assertEquals(None, self.conn.server_name)
 
 
-class NdrEchoTests(unittest.TestCase):
+class NdrEchoTests(TestCase):
 
     def test_info1_push(self):
         x = echo.info1()
diff --git a/source4/scripting/python/samba/tests/dcerpc/sam.py b/source4/scripting/python/samba/tests/dcerpc/sam.py
index 333f8d12b5..df943a11ba 100644
--- a/source4/scripting/python/samba/tests/dcerpc/sam.py
+++ b/source4/scripting/python/samba/tests/dcerpc/sam.py
@@ -32,6 +32,7 @@ def toArray((handle, array, num_entries)):
 class SamrTests(RpcInterfaceTestCase):
 
     def setUp(self):
+        super(SamrTests, self).setUp()
         self.conn = samr.samr("ncalrpc:", self.get_loadparm())
 
     def test_connect5(self):
diff --git a/source4/scripting/python/samba/tests/dcerpc/unix.py b/source4/scripting/python/samba/tests/dcerpc/unix.py
index 62169ad12c..7a3e715685 100644
--- a/source4/scripting/python/samba/tests/dcerpc/unix.py
+++ b/source4/scripting/python/samba/tests/dcerpc/unix.py
@@ -23,6 +23,7 @@ from samba.tests import RpcInterfaceTestCase
 class UnixinfoTests(RpcInterfaceTestCase):
 
     def setUp(self):
+        super(UnixinfoTests, self).setUp()
         self.conn = unixinfo.unixinfo("ncalrpc:", self.get_loadparm())
 
     def test_getpwuid(self):