diff options
| author | Clark Boylan <clark.boylan@gmail.com> | 2012-12-16 17:31:46 -0800 |
|---|---|---|
| committer | Clark Boylan <clark.boylan@gmail.com> | 2012-12-16 17:31:46 -0800 |
| commit | aef9802089dbc05d0f4c1ce86a3572172f47544b (patch) | |
| tree | 47956f598f73a9aa35a8450b0569d1f1ea7da41e | |
| parent | f04722ee22feed97aca23cd16864626d9672671c (diff) | |
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
| -rw-r--r-- | nova/test.py | 4 | ||||
| -rw-r--r-- | tools/test-requires | 2 |
2 files changed, 3 insertions, 3 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')) diff --git a/tools/test-requires b/tools/test-requires index 1d72f7114..6ee42d31c 100644 --- a/tools/test-requires +++ b/tools/test-requires @@ -4,7 +4,7 @@ distribute>=0.6.24 coverage discover feedparser -fixtures>=0.3.10 +fixtures>=0.3.12 mox==0.5.3 MySQL-python pep8==1.3.3 |