testsuite: capture stderr by default

This quiets down a lot of tests, especially for option parsing.

2 files changed, 15 insertions, 0 deletions

diff --git a/testsuite/Testsrc/Testlib/TestOptions/__init__.py b/testsuite/Testsrc/Testlib/TestOptions/__init__.py
index 00e250356..688f4e54c 100644
--- a/testsuite/Testsrc/Testlib/TestOptions/__init__.py
+++ b/testsuite/Testsrc/Testlib/TestOptions/__init__.py
@@ -73,7 +73,9 @@ class OptionTestCase(Bcfg2TestCase):
     def setUpClass(cls):
         # ensure that the option parser actually reads config files
         Parser.unit_test = False
+        Bcfg2TestCase.setUpClass()
 
     @classmethod
     def tearDownClass(cls):
         Parser.unit_test = True
+        Bcfg2TestCase.tearDownClass()
diff --git a/testsuite/common.py b/testsuite/common.py
index 5a08f8db5..49579d7ef 100644
--- a/testsuite/common.py
+++ b/testsuite/common.py
@@ -119,6 +119,19 @@ class Bcfg2TestCase(TestCase):
     :func:`assertXMLEqual`, a useful assertion method given all the
     XML used by Bcfg2.
     """
+    capture_stderr = True
+
+    @classmethod
+    def setUpClass(cls):
+        cls._stderr = sys.stderr
+        if cls.capture_stderr:
+            sys.stderr = sys.stdout
+
+    @classmethod
+    def tearDownClass(cls):
+        if cls.capture_stderr:
+            sys.stderr = cls._stderr
+
     def assertXMLEqual(self, el1, el2, msg=None):
         """ Test that the two XML trees given are equal. """
         if msg is None: