Remove unnecessary python path updates for bundled subunit/testtools.

[samba.git] / lib / subunit / filters / subunit-ls

diff --git a/lib/subunit/filters/subunit-ls b/lib/subunit/filters/subunit-ls
index 15ec4b01e6ffbd4861aa66f92c37dd45d1a38510..82db4c371ac1e820472d6869c60c86ee549d5815 100755 (executable)
--- a/lib/subunit/filters/subunit-ls
+++ b/lib/subunit/filters/subunit-ls
@@ -18,58 +18,12 @@
 
 from optparse import OptionParser
 import sys
-import unittest
 
 from subunit import DiscardStream, ProtocolTestCase
-
-class TestIdPrintingResult(unittest.TestResult):
-
-    def __init__(self, stream, show_times=False):
-        """Create a FilterResult object outputting to stream."""
-        unittest.TestResult.__init__(self)
-        self._stream = stream
-        self.failed_tests = 0
-        self.__time = 0
-        self.show_times = show_times
-        self._test = None
-        self._test_duration = 0
-        
-    def addError(self, test, err):
-        self.failed_tests += 1
-        self._test = test
-
-    def addFailure(self, test, err):
-        self.failed_tests += 1
-        self._test = test
-
-    def addSuccess(self, test):
-        self._test = test
-
-    def reportTest(self, test, duration):
-        if self.show_times:
-            seconds = duration.seconds
-            seconds += duration.days * 3600 * 24
-            seconds += duration.microseconds / 1000000.0
-            self._stream.write(test.id() + ' %0.3f\n' % seconds)
-        else:
-            self._stream.write(test.id() + '\n')
-
-    def startTest(self, test):
-        self._start_time = self._time()
-
-    def stopTest(self, test):
-        test_duration = self._time() - self._start_time
-        self.reportTest(self._test, test_duration)
-
-    def time(self, time):
-        self.__time = time
-
-    def _time(self):
-        return self.__time
-
-    def wasSuccessful(self):
-        "Tells whether or not this result was a success"
-        return self.failed_tests == 0
+from subunit.test_results import (
+    AutoTimingTestResultDecorator,
+    TestIdPrintingResult,
+    )
 
 
 parser = OptionParser(description=__doc__)
@@ -79,7 +33,8 @@ parser.add_option("--times", action="store_true",
 parser.add_option("--no-passthrough", action="store_true",
     help="Hide all non subunit input.", default=False, dest="no_passthrough")
 (options, args) = parser.parse_args()
-result = TestIdPrintingResult(sys.stdout, options.times)
+result = AutoTimingTestResultDecorator(
+    TestIdPrintingResult(sys.stdout, options.times))
 if options.no_passthrough:
     passthrough_stream = DiscardStream()
 else: