X-Git-Url: http://git.samba.org/samba.git/?p=third_party%2Fsubunit;a=blobdiff_plain;f=python%2Fsubunit%2Ftests%2Ftest_test_protocol.py;fp=python%2Fsubunit%2Ftests%2Ftest_test_protocol.py;h=c93aabd80cdd25e5f9337a99c1ef05306c78c62b;hp=03d921abf11ab3871778a68b081a5a107d1da7b8;hb=7384e95b6e49ea544739abfdd52e846eab292f69;hpb=dc1985ebe6751f309abd605a14c3fddb0b2600b9 diff --git a/python/subunit/tests/test_test_protocol.py b/python/subunit/tests/test_test_protocol.py index 03d921a..c93aabd 100644 --- a/python/subunit/tests/test_test_protocol.py +++ b/python/subunit/tests/test_test_protocol.py @@ -22,11 +22,18 @@ from testtools import skipIf, TestCase from testtools.compat import _b, _u, BytesIO, StringIO from testtools.content import Content, TracebackContent from testtools.content_type import ContentType -from testtools.tests.helpers import ( - Python26TestResult, - Python27TestResult, - ExtendedTestResult, - ) +try: + from testtools.testresult.doubles import ( + Python26TestResult, + Python27TestResult, + ExtendedTestResult, + ) +except ImportError: + from testtools.tests.helpers import ( + Python26TestResult, + Python27TestResult, + ExtendedTestResult, + ) import subunit from subunit import _remote_exception_str, _remote_exception_str_chunked