openstack/python-novaclient
Code Issues Proposed changes

Bring stdout/stderr capturing in line w/ nova

Browse Source 
In .testr.conf, we reference OS_STDOUT_CAPTURE / OS_STDERR_CAPTURE
while in novaclient/tests/utils.py we reference OS_STDOUT_NOCAPTURE
and OS_STDERR_NOCAPTURE.  This change brings things more in line
with nova project by referencing OS_STDOUT_CAPTURE / OS_STDERR_CAPTURE
in both locations.

Change-Id: I22efdec84bef78e99d1d95303cadade6011d76a2
Fixes: bug #1192997
This commit is contained in:
Matt Thompson 2013-06-20 15:52:04 +01:00
parent 909a53b161
commit c7e9b1b8dc
1 changed files with 4 additions and 4 deletions

8
novaclient/tests/utils.py

@ -12,12 +12,12 @@ class TestCase(testtools.TestCase):
def setUp(self):
super(TestCase, self).setUp()
if (os.environ.get('OS_STDOUT_NOCAPTURE') == 'True' and
os.environ.get('OS_STDOUT_NOCAPTURE') == '1'):
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_NOCAPTURE') == 'True' and
os.environ.get('OS_STDERR_NOCAPTURE') == '1'):
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))