Generate scenarios inside subunit.tests.test_suite, not by subclassing WithScenarios.

diff --git a/python/subunit/tests/__init__.py b/python/subunit/tests/__init__.py
index b5a7fdce5973490575c19001e6d3cefb6a70f42c..c1c2c64a3e722c8a6059aea86a9215adce293a33 100644 (file)
--- 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

diff --git a/python/subunit/tests/test_output_filter.py b/python/subunit/tests/test_output_filter.py
index f03a7b7eb8c94c24d8e4954393d136e609ea78ce..3373d4847b741b857262bd206b346e8564238715 100644 (file)
--- a/python/subunit/tests/test_output_filter.py
+++ b/python/subunit/tests/test_output_filter.py
@@ -22,7 +22,6 @@ import sys
 from tempfile import NamedTemporaryFile
 
 from contextlib import contextmanager
-from testscenarios import WithScenarios
 from testtools import TestCase
 from testtools.compat import _u
 from testtools.matchers import (
@@ -58,7 +57,7 @@ class SafeOptionParser(optparse.OptionParser):
 safe_parse_arguments = partial(parse_arguments, ParserClass=SafeOptionParser)
 
 
-class TestStatusArgParserTests(WithScenarios, TestCase):
+class TestStatusArgParserTests(TestCase):
 
     scenarios = [
         (cmd, dict(command=cmd, option='--' + cmd)) for cmd in _ALL_ACTIONS
@@ -204,7 +203,7 @@ def temp_file_contents(data):
         yield f
 
 
-class StatusStreamResultTests(WithScenarios, TestCase):
+class StatusStreamResultTests(TestCase):
 
     scenarios = [
         (s, dict(status=s, option='--' + s)) for s in _ALL_ACTIONS