diff options
Diffstat (limited to 'lib/testtools/testtools/tests/test_run.py')
| -rw-r--r-- | lib/testtools/testtools/tests/test_run.py | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/lib/testtools/testtools/tests/test_run.py b/lib/testtools/testtools/tests/test_run.py index 8f88fb62ec..d2974f6373 100644 --- a/lib/testtools/testtools/tests/test_run.py +++ b/lib/testtools/testtools/tests/test_run.py @@ -1,10 +1,13 @@ -# Copyright (c) 2010 Testtools authors. See LICENSE for details. +# Copyright (c) 2010 testtools developers. See LICENSE for details. """Tests for the test runner logic.""" -from testtools.helpers import try_import, try_imports +from testtools.compat import ( + _b, + StringIO, + ) +from testtools.helpers import try_import fixtures = try_import('fixtures') -StringIO = try_imports(['StringIO.StringIO', 'io.StringIO']) import testtools from testtools import TestCase, run @@ -16,7 +19,7 @@ if fixtures: def __init__(self): self.package = fixtures.PythonPackage( - 'runexample', [('__init__.py', """ + 'runexample', [('__init__.py', _b(""" from testtools import TestCase class TestFoo(TestCase): @@ -27,7 +30,7 @@ class TestFoo(TestCase): def test_suite(): from unittest import TestLoader return TestLoader().loadTestsFromName(__name__) -""")]) +"""))]) def setUp(self): super(SampleTestFixture, self).setUp() @@ -41,7 +44,7 @@ class TestRun(TestCase): def test_run_list(self): if fixtures is None: self.skipTest("Need fixtures") - package = self.useFixture(SampleTestFixture()) + self.useFixture(SampleTestFixture()) out = StringIO() run.main(['prog', '-l', 'testtools.runexample.test_suite'], out) self.assertEqual("""testtools.runexample.TestFoo.test_bar @@ -51,7 +54,7 @@ testtools.runexample.TestFoo.test_quux def test_run_load_list(self): if fixtures is None: self.skipTest("Need fixtures") - package = self.useFixture(SampleTestFixture()) + self.useFixture(SampleTestFixture()) out = StringIO() # We load two tests - one that exists and one that doesn't, and we # should get the one that exists and neither the one that doesn't nor @@ -60,10 +63,10 @@ testtools.runexample.TestFoo.test_quux tempname = tempdir.path + '/tests.list' f = open(tempname, 'wb') try: - f.write(""" + f.write(_b(""" testtools.runexample.TestFoo.test_bar testtools.runexample.missingtest -""") +""")) finally: f.close() run.main(['prog', '-l', '--load-list', tempname, @@ -71,6 +74,7 @@ testtools.runexample.missingtest self.assertEqual("""testtools.runexample.TestFoo.test_bar """, out.getvalue()) + def test_suite(): from unittest import TestLoader return TestLoader().loadTestsFromName(__name__) |