--- a/src/tests/cli/t_setUp.py	Wed Jul 30 17:01:30 2008 -0700
+++ b/src/tests/cli/t_setUp.py	Thu Jul 31 15:06:40 2008 -0700
@@ -42,17 +42,17 @@
                 testutils.SingleDepotTestCase.setUp(self)
                 raise pkg5unittest.SuccessfulException("Died in setup")
 
-        def test_1(self):
+        def first_depot_start(self):
                 """Attempt to start a depot, which dies because of an exception
                 raised during setUP.
                 """
 
                 durl = self.dc.get_depot_url()
 
-        def test_2(self):
-                """Test whether the first depot was shut down. If this test
+        def second_depot_start(self):
+                """Test whether the first depot was shut down.  If this test
                 raises a exception because a depot was already running on that
-                port, then the test has failed. If it raises the
+                port, then the test has failed.  If it raises the
                 SuccessfulException, then it has passed because it was able to
                 successfully start a depot."""
 

--- a/src/tests/cli/testutils.py	Wed Jul 30 17:01:30 2008 -0700
+++ b/src/tests/cli/testutils.py	Thu Jul 31 15:06:40 2008 -0700
@@ -514,7 +514,8 @@
                 CliTestCase.tearDown(self)
 
         def run(self, result=None):
-                if result is None: result = self.defaultTestResult()
+                if result is None:
+                        result = self.defaultTestResult()
                 CliTestCase.run(self, result)
                 # Try to tearDown in case depots are running. Ignore the
                 # errors from tearDown because its assumptions may not

--- a/src/tests/pkg5unittest.py	Wed Jul 30 17:01:30 2008 -0700
+++ b/src/tests/pkg5unittest.py	Thu Jul 31 15:06:40 2008 -0700
@@ -53,7 +53,8 @@
                 # code in unittest.TestCase.run is that
                 # except SuccessfulException: has been added and counted as
                 # a successful test.
-                if result is None: result = self.defaultTestResult()
+                if result is None:
+                        result = self.defaultTestResult()
                 result.startTest(self)
                 testMethod = getattr(self, self._TestCase__testMethodName)
                 try:
@@ -86,7 +87,8 @@
                         except:
                                 result.addError(self, self._TestCase__exc_info())
                                 ok = False
-                        if ok: result.addSuccess(self)
+                        if ok:
+                                result.addSuccess(self)
                 finally:
                         result.stopTest(self)