Rev 4797: Delete old run code. in http://bazaar.launchpad.net/~lifeless/bzr/subunit

[Robert Collins]

At http://bazaar.launchpad.net/~lifeless/bzr/subunit

------------------------------------------------------------
revno: 4797
revision-id: robertc at robertcollins.net-20091205084348-75beh857mv0jdlav
parent: robertc at robertcollins.net-20091205083555-6bvltc95cwsl27v4
committer: Robert Collins <robertc at robertcollins.net>
branch nick: subunit
timestamp: Sat 2009-12-05 19:43:48 +1100
message:
  Delete old run code.
=== modified file 'bzrlib/tests/__init__.py'
--- a/bzrlib/tests/__init__.py	2009-12-05 08:35:55 +0000
+++ b/bzrlib/tests/__init__.py	2009-12-05 08:43:48 +0000
@@ -1602,100 +1602,6 @@
         else:
             self._do_skip(result, reason)
 
-    def _run(self, result=None):
-        if result is None: result = self.defaultTestResult()
-        result.startTest(self)
-        try:
-            self._run(result)
-            return result
-        finally:
-            result.stopTest(self)
-
-    def _run(self, result):
-        try:
-            absent_attr = object()
-            # Python 2.5
-            method_name = getattr(self, '_testMethodName', absent_attr)
-            if method_name is absent_attr:
-                # Python 2.4
-                method_name = getattr(self, '_TestCase__testMethodName')
-            testMethod = getattr(self, method_name)
-            try:
-                try:
-                    self.setUp()
-                    if not self._bzr_test_setUp_run:
-                        self.fail(
-                            "test setUp did not invoke "
-                            "bzrlib.tests.TestCase's setUp")
-                except KeyboardInterrupt:
-                    self._runCleanups()
-                    raise
-                except KnownFailure:
-                    self._do_known_failure(result)
-                    self.tearDown()
-                    return
-                except TestNotApplicable, e:
-                    self._do_not_applicable(result, e)
-                    self.tearDown()
-                    return
-                except TestSkipped, e:
-                    self._do_skip(result, e.args[0])
-                    self.tearDown()
-                    return result
-                except UnavailableFeature, e:
-                    self._do_unsupported_or_skip(result, e.args[0])
-                    self.tearDown()
-                    return
-                except:
-                    result.addError(self, sys.exc_info())
-                    self._runCleanups()
-                    return result
-
-                ok = False
-                try:
-                    testMethod()
-                    ok = True
-                except KnownFailure:
-                    self._do_known_failure(result)
-                except self.failureException:
-                    result.addFailure(self, sys.exc_info())
-                except TestNotApplicable, e:
-                    self._do_not_applicable(result, e)
-                except TestSkipped, e:
-                    if not e.args:
-                        reason = "No reason given."
-                    else:
-                        reason = e.args[0]
-                    self._do_skip(result, reason)
-                except UnavailableFeature, e:
-                    self._do_unsupported_or_skip(result, e.args[0])
-                except KeyboardInterrupt:
-                    self._runCleanups()
-                    raise
-                except:
-                    result.addError(self, sys.exc_info())
-
-                try:
-                    self.tearDown()
-                    if not self._bzr_test_tearDown_run:
-                        self.fail(
-                            "test tearDown did not invoke "
-                            "bzrlib.tests.TestCase's tearDown")
-                except KeyboardInterrupt:
-                    self._runCleanups()
-                    raise
-                except:
-                    result.addError(self, sys.exc_info())
-                    self._runCleanups()
-                    ok = False
-                if ok: result.addSuccess(self)
-                return result
-            except KeyboardInterrupt:
-                self._runCleanups()
-                raise
-        finally:
-            pass
-
     def tearDown(self):
         self._log_contents = ''
         super(TestCase, self).tearDown()