Revert "Future-proof test runner"

This reverts commit ffa65c8.
LaurentRDC · Dec 2, 2020 · ebb3c76 · ebb3c76
1 parent ffa65c8
commit ebb3c76
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 25 deletions.
diff --git a/tests/test_dataset.py b/tests/test_dataset.py
@@ -467,5 +467,4 @@ def tearDown(self):
 
 
 if __name__ == "__main__":
-    from utils import FutureProofTestRunner
-    unittest.main(testRunner=FutureProofTestRunner)
+    unittest.main()
diff --git a/tests/test_plugins.py b/tests/test_plugins.py
@@ -2,9 +2,6 @@
 import unittest
 from pathlib import Path
 from tempfile import gettempdir
-from contextlib import redirect_stdout
-import io
-
 
 from iris import AbstractRawDataset, DiffractionDataset
 from iris.plugins import load_plugin
@@ -48,11 +45,8 @@ def test_reduction(self):
 class TestBrokenPlugin(unittest.TestCase):
     def test_loading_broken_plugin(self):
         """ Test that exceptions are caught when loading a broken plug-in. """
-        to_the_void = io.StringIO()
-        with redirect_stdout(to_the_void):
-            load_plugin(BROKEN_PLUGIN_PATH)
+        load_plugin(BROKEN_PLUGIN_PATH)
 
 
 if __name__ == "__main__":
-    from utils import FutureProofTestRunner
-    unittest.main(testRunner=FutureProofTestRunner)
+    unittest.main()
diff --git a/tests/test_raw.py b/tests/test_raw.py
@@ -71,5 +71,4 @@ def test_init_metadata(self):
 
 
 if __name__ == "__main__":
-    from utils import FutureProofTestRunner
-    unittest.main(testRunner=FutureProofTestRunner)
+    unittest.main()
diff --git a/tests/utils.py b/tests/utils.py