testtools: Update to latest upstream version.

[kai/samba.git] / lib / testtools / testtools / tests / test_distutilscmd.py

diff --git a/lib/testtools/testtools/tests/test_distutilscmd.py b/lib/testtools/testtools/tests/test_distutilscmd.py
index c485a473d3939169c115ccf08a19fb2aa682aabd..59762dfd688778d5e2071cd19c8a8fef75d3988f 100644 (file)
--- a/lib/testtools/testtools/tests/test_distutilscmd.py
+++ b/lib/testtools/testtools/tests/test_distutilscmd.py
@@ -6,6 +6,7 @@ from distutils.dist import Distribution
 
 from testtools.compat import (
     _b,
+    _u,
     BytesIO,
     )
 from testtools.helpers import try_import
@@ -52,7 +53,7 @@ class TestCommandTest(TestCase):
 
     def test_test_module(self):
         self.useFixture(SampleTestFixture())
-        stream = BytesIO()
+        stdout = self.useFixture(fixtures.StringStream('stdout'))
         dist = Distribution()
         dist.script_name = 'setup.py'
         dist.script_args = ['test']
@@ -60,11 +61,11 @@ class TestCommandTest(TestCase):
         dist.command_options = {
             'test': {'test_module': ('command line', 'testtools.runexample')}}
         cmd = dist.reinitialize_command('test')
-        cmd.runner.stdout = stream
-        dist.run_command('test')
+        with fixtures.MonkeyPatch('sys.stdout', stdout.stream):
+            dist.run_command('test')
         self.assertThat(
-            stream.getvalue(),
-            MatchesRegex(_b("""Tests running...
+            stdout.getDetails()['stdout'].as_text(),
+            MatchesRegex(_u("""Tests running...
 
 Ran 2 tests in \\d.\\d\\d\\ds
 OK
@@ -72,7 +73,7 @@ OK
 
     def test_test_suite(self):
         self.useFixture(SampleTestFixture())
-        stream = BytesIO()
+        stdout = self.useFixture(fixtures.StringStream('stdout'))
         dist = Distribution()
         dist.script_name = 'setup.py'
         dist.script_args = ['test']
@@ -82,11 +83,11 @@ OK
                 'test_suite': (
                     'command line', 'testtools.runexample.test_suite')}}
         cmd = dist.reinitialize_command('test')
-        cmd.runner.stdout = stream
-        dist.run_command('test')
+        with fixtures.MonkeyPatch('sys.stdout', stdout.stream):
+            dist.run_command('test')
         self.assertThat(
-            stream.getvalue(),
-            MatchesRegex(_b("""Tests running...
+            stdout.getDetails()['stdout'].as_text(),
+            MatchesRegex(_u("""Tests running...
 
 Ran 2 tests in \\d.\\d\\d\\ds
 OK