From 50bb59d9e9f02af097f16546b88a1c63e6bb262f Mon Sep 17 00:00:00 2001
From: Jonathan Lange <jml@canonical.com>
Date: Wed, 1 Feb 2012 18:38:26 +0000
Subject: Deal with testtools moving doubles out of helpers.

---
 python/subunit/tests/test_test_protocol.py | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

(limited to 'python')

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
-- 
cgit v1.2.1