summaryrefslogtreecommitdiff
path: root/python/subunit/tests/__init__.py
diff options
context:
space:
mode:
authorThomi Richards <thomi.richards@canonical.com>2013-12-09 17:58:22 +1300
committerThomi Richards <thomi.richards@canonical.com>2013-12-09 17:58:22 +1300
commitdb6c2795d80729fcc6e197b7c533e91b6dcdcbcb (patch)
tree37b2c2222db12c9eb8e4e2d4a4c2f0fe5d61514a /python/subunit/tests/__init__.py
parent9ba9d9588e66e97a5aade4b5f5b34ac3c2627cd8 (diff)
downloadsubunit-git-db6c2795d80729fcc6e197b7c533e91b6dcdcbcb.tar.gz
Generate scenarios inside subunit.tests.test_suite, not by subclassing WithScenarios.
Diffstat (limited to 'python/subunit/tests/__init__.py')
-rw-r--r--python/subunit/tests/__init__.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/python/subunit/tests/__init__.py b/python/subunit/tests/__init__.py
index b5a7fdc..c1c2c64 100644
--- a/python/subunit/tests/__init__.py
+++ b/python/subunit/tests/__init__.py
@@ -17,6 +17,8 @@
import sys
from unittest import TestLoader
+from testscenarios import generate_scenarios
+
# Before the test module imports to avoid circularity.
# For testing: different pythons have different str() implementations.
@@ -61,5 +63,7 @@ def test_suite():
result.addTest(loader.loadTestsFromModule(test_subunit_tags))
result.addTest(loader.loadTestsFromModule(test_subunit_stats))
result.addTest(loader.loadTestsFromModule(test_run))
- result.addTest(loader.loadTestsFromModule(test_output_filter))
+ result.addTests(
+ generate_scenarios(loader.loadTestsFromModule(test_output_filter))
+ )
return result