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

setUp methods are called, fix formatting.

1 files changed, 11 insertions, 6 deletions

diff --git a/source4/scripting/python/samba/tests/__init__.py b/source4/scripting/python/samba/tests/__init__.py
index 78c4676aa72..0583f8856a4 100644
--- a/source4/scripting/python/samba/tests/__init__.py
+++ b/source4/scripting/python/samba/tests/__init__.py
@@ -30,9 +30,10 @@ from testtools.testcase import TestCase, TestSkipped
 
 
 class LdbTestCase(TestCase):
-
     """Trivial test case for running tests against a LDB."""
+
     def setUp(self):
+        super(LdbTestCase, self).setUp()
         self.filename = os.tempnam()
         self.ldb = samba.Ldb(self.filename)
 
@@ -63,14 +64,16 @@ class SubstituteVarTestCase(TestCase):
         self.assertEquals("", samba.substitute_var("", {}))
 
     def test_nothing(self):
-        self.assertEquals("foo bar", samba.substitute_var("foo bar", {"bar": "bla"}))
+        self.assertEquals("foo bar",
+                samba.substitute_var("foo bar", {"bar": "bla"}))
 
     def test_replace(self):
-        self.assertEquals("foo bla", samba.substitute_var("foo ${bar}", {"bar": "bla"}))
+        self.assertEquals("foo bla",
+                samba.substitute_var("foo ${bar}", {"bar": "bla"}))
 
     def test_broken(self):
         self.assertEquals("foo ${bdkjfhsdkfh sdkfh ", 
-                samba.substitute_var("foo ${bdkjfhsdkfh sdkfh ", {"bar": "bla"}))
+            samba.substitute_var("foo ${bdkjfhsdkfh sdkfh ", {"bar": "bla"}))
 
     def test_unknown_var(self):
         self.assertEquals("foo ${bla} gsff", 
@@ -78,7 +81,8 @@ class SubstituteVarTestCase(TestCase):
                 
     def test_check_all_substituted(self):
         samba.check_all_substituted("nothing to see here")
-        self.assertRaises(Exception, samba.check_all_substituted, "Not subsituted: ${FOOBAR}")
+        self.assertRaises(Exception, samba.check_all_substituted,
+                "Not subsituted: ${FOOBAR}")
 
 
 class LdbExtensionTests(TestCaseInTempDir):
@@ -88,7 +92,8 @@ class LdbExtensionTests(TestCaseInTempDir):
         l = samba.Ldb(path)
         try:
             l.add({"dn": "foo=dc", "bar": "bla"})
-            self.assertEquals("bla", l.searchone(basedn=ldb.Dn(l, "foo=dc"), attribute="bar"))
+            self.assertEquals("bla",
+                l.searchone(basedn=ldb.Dn(l, "foo=dc"), attribute="bar"))
         finally:
             del l
             os.unlink(path)