--- /auto/nova/tools/latest/lib/python2.4/unittest.py	2008-10-23 08:32:43.842424000 -0700
+++ ../../../unittest.py	2009-03-22 14:05:27.491356000 -0700
@@ -247,24 +247,27 @@
         result.startTest(self)
         testMethod = getattr(self, self.__testMethodName)
         try:
+
+            ok = True
+
             try:
                 self.setUp()
             except KeyboardInterrupt:
                 raise
             except:
                 result.addError(self, self.__exc_info())
-                return
+                ok = False
 
-            ok = False
-            try:
-                testMethod()
-                ok = True
-            except self.failureException:
-                result.addFailure(self, self.__exc_info())
-            except KeyboardInterrupt:
-                raise
-            except:
-                result.addError(self, self.__exc_info())
+            if ok:
+
+                try:
+                    testMethod()
+                except self.failureException:
+                    result.addFailure(self, self.__exc_info())
+                except KeyboardInterrupt:
+                    raise
+                except:
+                    result.addError(self, self.__exc_info())
 
             try:
                 self.tearDown()