diff options
| author | Jonathan Lange <jml@canonical.com> | 2012-02-01 18:38:26 +0000 |
|---|---|---|
| committer | Jonathan Lange <jml@canonical.com> | 2012-02-01 18:38:26 +0000 |
| commit | 50bb59d9e9f02af097f16546b88a1c63e6bb262f (patch) | |
| tree | 08f373c1d9e4d42a5d35e2f5dde83c9eb44f5e1b /python | |
| parent | be1842cb7f6de9e87aa7fd7e5c01aaed0febb80b (diff) | |
| download | subunit-50bb59d9e9f02af097f16546b88a1c63e6bb262f.tar.gz | |
Deal with testtools moving doubles out of helpers.
Diffstat (limited to 'python')
| -rw-r--r-- | python/subunit/tests/test_test_protocol.py | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/python/subunit/tests/test_test_protocol.py b/python/subunit/tests/test_test_protocol.py index c5a064e..6297ea9 100644 --- a/python/subunit/tests/test_test_protocol.py +++ b/python/subunit/tests/test_test_protocol.py @@ -21,11 +21,16 @@ import os from testtools.content import Content, TracebackContent from testtools.content_type import ContentType -from testtools.tests.helpers import ( - Python26TestResult, - Python27TestResult, - ExtendedTestResult, - ) +from testtools import try_imports +Python26TestResult = try_imports( + ['testtools.testresult.doubles.Python26TestResult', + 'testtools.tests.helpers.Python26TestResult']) +Python27TestResult = try_imports( + ['testtools.testresult.doubles.Python27TestResult', + 'testtools.tests.helpers.Python27TestResult']) +ExtendedTestResult = try_imports( + ['testtools.testresult.doubles.ExtendedTestResult', + 'testtools.tests.helpers.ExtendedTestResult']) import subunit from subunit import _remote_exception_str |