summaryrefslogtreecommitdiff
path: root/python/subunit
diff options
context:
space:
mode:
authorRobert Collins <robertc@robertcollins.net>2009-10-19 18:48:32 +1100
committerRobert Collins <robertc@robertcollins.net>2009-10-19 18:48:32 +1100
commit4e7bd221e171a96e44231218025157f4886a9cc5 (patch)
treed7752030971077d36077f571f617989521faeb4b /python/subunit
parentaff764783084ed070f4d7967f85620a9f1d93c61 (diff)
downloadsubunit-git-4e7bd221e171a96e44231218025157f4886a9cc5.tar.gz
Support progress on the ExtendedToOriginal decorator.
Diffstat (limited to 'python/subunit')
-rw-r--r--python/subunit/test_results.py6
-rw-r--r--python/subunit/tests/test_test_results.py16
2 files changed, 22 insertions, 0 deletions
diff --git a/python/subunit/test_results.py b/python/subunit/test_results.py
index 66bb403..49fc731 100644
--- a/python/subunit/test_results.py
+++ b/python/subunit/test_results.py
@@ -329,6 +329,12 @@ class ExtendedToOriginalDecorator(object):
lines.append('------------\n')
return ''.join(lines)
+ def progress(self, offset, whence):
+ method = getattr(self.decorated, 'progress', None)
+ if method is None:
+ return
+ return method(offset, whence)
+
def startTest(self, test):
return self.decorated.startTest(test)
diff --git a/python/subunit/tests/test_test_results.py b/python/subunit/tests/test_test_results.py
index bdb603f..7400f0b 100644
--- a/python/subunit/tests/test_test_results.py
+++ b/python/subunit/tests/test_test_results.py
@@ -131,6 +131,9 @@ class ExtendedTestResult(Python27TestResult):
else:
self._calls.append(('addUnexpectedSuccess', test))
+ def progress(self, offset, whence):
+ self._calls.append(('progress', offset, whence))
+
class TestExtendedToOriginalResultDecoratorBase(unittest.TestCase):
@@ -237,6 +240,19 @@ class TestExtendedToOriginalResultDecoratorBase(unittest.TestCase):
class TestExtendedToOriginalResultDecorator(
TestExtendedToOriginalResultDecoratorBase):
+ def test_progress_py26(self):
+ self.make_26_result()
+ self.converter.progress(1, 2)
+
+ def test_progress_py27(self):
+ self.make_27_result()
+ self.converter.progress(1, 2)
+
+ def test_progress_pyextended(self):
+ self.make_extended_result()
+ self.converter.progress(1, 2)
+ self.assertEqual([('progress', 1, 2)], self.result._calls)
+
def test_startTest_py26(self):
self.make_26_result()
self.converter.startTest(self)