Merge "Make test_queries save stdout in tox testr"

elastic_recheck/tests/__init__.py

@@ -0,0 +1,31 @@
+# All Rights Reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+import fixtures
+import os
+import testtools
+
+
+class TestCase(testtools.TestCase):
+
+    def setUp(self):
+        super(TestCase, self).setUp()
+        if (os.environ.get('OS_STDOUT_CAPTURE') == 'True' or
+                os.environ.get('OS_STDOUT_CAPTURE') == '1'):
+            stdout = self.useFixture(fixtures.StringStream('stdout')).stream
+            self.useFixture(fixtures.MonkeyPatch('sys.stdout', stdout))
+        if (os.environ.get('OS_STDERR_CAPTURE') == 'True' or
+                os.environ.get('OS_STDERR_CAPTURE') == '1'):
+            stderr = self.useFixture(fixtures.StringStream('stderr')).stream
+            self.useFixture(fixtures.MonkeyPatch('sys.stderr', stderr))

elastic_recheck/tests/test_queries.py

@@ -16,15 +16,15 @@ import os
 
 import ConfigParser
 from launchpadlib import launchpad
-import testtools
 import yaml
 
 from elastic_recheck import elasticRecheck
+from elastic_recheck import tests
 
 LPCACHEDIR = os.path.expanduser('~/.launchpadlib/cache')
 
 
-class TestQueries(testtools.TestCase):
+class TestQueries(tests.TestCase):
     def setUp(self):
         super(TestQueries, self).setUp()
         config = ConfigParser.ConfigParser({'server_password': None})