diff options
| author | Monty Taylor <mordred@inaugust.com> | 2013-03-12 12:06:16 -0400 |
|---|---|---|
| committer | Monty Taylor <mordred@inaugust.com> | 2013-03-12 12:06:16 -0400 |
| commit | 6e4a663b188e3bd36fd7554d7f5ce0c57df8b11e (patch) | |
| tree | dbb55946559b128f5712930f5bd43956248cb9d1 | |
| parent | 24f7985ac5e60d021298bc36a578bf383a47ed37 (diff) | |
| download | pbr-6e4a663b188e3bd36fd7554d7f5ce0c57df8b11e.tar.gz | |
Put stdout capture in the base test class.
Change-Id: I829b10fdae4def7664f71f4e6f835577075fefcc
| -rw-r--r-- | oslo/packaging/tests/test_setup.py | 13 | ||||
| -rw-r--r-- | oslo/packaging/tests/utils.py | 13 |
2 files changed, 13 insertions, 13 deletions
diff --git a/oslo/packaging/tests/test_setup.py b/oslo/packaging/tests/test_setup.py index ae534f2..55d35d9 100644 --- a/oslo/packaging/tests/test_setup.py +++ b/oslo/packaging/tests/test_setup.py @@ -155,19 +155,6 @@ class GitLogsTest(utils.BaseTestCase): class BuildSphinxTest(utils.BaseTestCase): - def setUp(self): - super(BuildSphinxTest, 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)) - self.log_fixture = self.useFixture( - fixtures.FakeLogger('oslo.packaging')) - def test_build_sphinx(self): self.useFixture(fixtures.MonkeyPatch( diff --git a/oslo/packaging/tests/utils.py b/oslo/packaging/tests/utils.py index deb9993..b7ba750 100644 --- a/oslo/packaging/tests/utils.py +++ b/oslo/packaging/tests/utils.py @@ -16,6 +16,8 @@ """Common utilities used in testing""" +import os + import fixtures import testtools @@ -24,6 +26,17 @@ class BaseTestCase(testtools.TestCase): def setUp(self): super(BaseTestCase, 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)) + self.log_fixture = self.useFixture( + fixtures.FakeLogger('oslo.packaging')) + self.useFixture(fixtures.NestedTempfile()) self.useFixture(fixtures.FakeLogger()) self.useFixture(fixtures.Timeout(30, True)) |