summaryrefslogtreecommitdiff
path: root/python/subunit/tests/__init__.py
diff options
context:
space:
mode:
authorRobert Collins <robertc@robertcollins.net>2013-06-16 22:28:11 +1200
committerRobert Collins <robertc@robertcollins.net>2013-06-16 22:28:11 +1200
commitbf8e1ee6e053c12ebfbdebd48954af695948c492 (patch)
tree6250d0ef889471cbbf78b999d36df92a3ca25ca9 /python/subunit/tests/__init__.py
parent12bcba4d055d8cede155976cba1acb8a5a7f2994 (diff)
downloadsubunit-git-bf8e1ee6e053c12ebfbdebd48954af695948c492.tar.gz
BUG FIXES
~~~~~~~~~ * Removed GPL files that were (C) non Subunit Developers - they are incompatible for binary distribution, which affects redistributors. (Robert Collins, #1185591)
Diffstat (limited to 'python/subunit/tests/__init__.py')
-rw-r--r--python/subunit/tests/__init__.py27
1 files changed, 14 insertions, 13 deletions
diff --git a/python/subunit/tests/__init__.py b/python/subunit/tests/__init__.py
index 4275229..3552eff 100644
--- a/python/subunit/tests/__init__.py
+++ b/python/subunit/tests/__init__.py
@@ -14,8 +14,9 @@
# limitations under that license.
#
+from unittest import TestLoader
+
from subunit.tests import (
- TestUtil,
test_chunked,
test_details,
test_progress_model,
@@ -30,16 +31,16 @@ from subunit.tests import (
)
def test_suite():
- result = TestUtil.TestSuite()
- result.addTest(test_chunked.test_suite())
- result.addTest(test_details.test_suite())
- result.addTest(test_progress_model.test_suite())
- result.addTest(test_test_results.test_suite())
- result.addTest(test_test_protocol.test_suite())
- result.addTest(test_test_protocol2.test_suite())
- result.addTest(test_tap2subunit.test_suite())
- result.addTest(test_subunit_filter.test_suite())
- result.addTest(test_subunit_tags.test_suite())
- result.addTest(test_subunit_stats.test_suite())
- result.addTest(test_run.test_suite())
+ loader = TestLoader()
+ result = loader.loadTestsFromModule(test_chunked)
+ result.addTest(loader.loadTestsFromModule(test_details))
+ result.addTest(loader.loadTestsFromModule(test_progress_model))
+ result.addTest(loader.loadTestsFromModule(test_test_results))
+ result.addTest(loader.loadTestsFromModule(test_test_protocol))
+ result.addTest(loader.loadTestsFromModule(test_test_protocol2))
+ result.addTest(loader.loadTestsFromModule(test_tap2subunit))
+ result.addTest(loader.loadTestsFromModule(test_subunit_filter))
+ result.addTest(loader.loadTestsFromModule(test_subunit_tags))
+ result.addTest(loader.loadTestsFromModule(test_subunit_stats))
+ result.addTest(loader.loadTestsFromModule(test_run))
return result