Merge trunk.

[third_party/subunit] / python / subunit / tests / __init__.py

diff --git a/python/subunit/tests/__init__.py b/python/subunit/tests/__init__.py
index 6a4a3b27d9d22679f4e966bde338357a975deaf3..b5a7fdce5973490575c19001e6d3cefb6a70f42c 100644 (file)
--- a/python/subunit/tests/__init__.py
+++ b/python/subunit/tests/__init__.py
@@ -6,7 +6,7 @@
 #  license at the users choice. A copy of both licenses are available in the
 #  project source as Apache-2.0 and BSD. You may not use this file except in
 #  compliance with one of these two licences.
-#  
+#
 #  Unless required by applicable law or agreed to in writing, software
 #  distributed under these licenses is distributed on an "AS IS" BASIS, WITHOUT
 #  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
@@ -34,6 +34,7 @@ from subunit.tests import (
     test_chunked,
     test_details,
     test_filters,
+    test_output_filter,
     test_progress_model,
     test_run,
     test_subunit_filter,
@@ -60,4 +61,5 @@ 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))
     return result