Make discover run the same tests as 'make test'.

[third_party/testtools] / testtools / tests / test_deferredruntest.py

diff --git a/testtools/tests/test_deferredruntest.py b/testtools/tests/test_deferredruntest.py
index 331092628834f1bd9bfbf5c9c5b07b2320f61d14..997f6c883dc4b3905723d1964f9f33583d58ee3a 100644 (file)
--- a/testtools/tests/test_deferredruntest.py
+++ b/testtools/tests/test_deferredruntest.py
@@ -771,7 +771,10 @@ class TestRunWithLogObservers(NeedsTwistedTestCase):
 
 
 def test_suite():
-    from unittest import TestLoader, TestSuite
-    return TestSuite(
-        [TestLoader().loadTestsFromName(__name__),
-         make_integration_tests()])
+    from unittest2 import TestLoader, TestSuite
+    return TestLoader().loadTestsFromName(__name__)
+
+
+def load_tests(loader, tests, pattern):
+    tests.addTest(make_integration_tests())
+    return tests