From db852873585c77bd68e7c81a2e820e4530f39842 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Sun, 16 Dec 2012 17:31:46 -0800 Subject: [PATCH] Replace fixtures.DetailStream with fixtures.StringStream. Fixtures 0.3.12 adds StringStream as a successor to DetailStream (this change was made for compatibility with python 3). Update Nova's tests to use StringStream instead of DetailStream. Change-Id: If697859a52f3a7db9dab38bd080b779bb3270287 --- nova/test.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nova/test.py b/nova/test.py index 15f0ff122..baeef49c2 100644 --- a/nova/test.py +++ b/nova/test.py @@ -193,11 +193,11 @@ class TestCase(testtools.TestCase): if (os.environ.get('OS_STDOUT_NOCAPTURE') != 'True' and os.environ.get('OS_STDOUT_NOCAPTURE') != '1'): - stdout = self.useFixture(fixtures.DetailStream('stdout')).stream + 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'): - stderr = self.useFixture(fixtures.DetailStream('stderr')).stream + stderr = self.useFixture(fixtures.StringStream('stderr')).stream self.useFixture(fixtures.MonkeyPatch('sys.stderr', stderr)) self.log_fixture = self.useFixture(fixtures.FakeLogger('nova'))