diff options
Diffstat (limited to 'python/subunit/tests')
| -rw-r--r-- | python/subunit/tests/test_subunit_filter.py | 4 | ||||
| -rw-r--r-- | python/subunit/tests/test_test_protocol.py | 46 | ||||
| -rw-r--r-- | python/subunit/tests/test_test_results.py | 10 |
3 files changed, 15 insertions, 45 deletions
diff --git a/python/subunit/tests/test_subunit_filter.py b/python/subunit/tests/test_subunit_filter.py index baef3f6..364fad9 100644 --- a/python/subunit/tests/test_subunit_filter.py +++ b/python/subunit/tests/test_subunit_filter.py @@ -300,10 +300,6 @@ xfail todo ('stopTest', 'foo - renamed')], [(ev[0], ev[1].id()) for ev in result._events]) - if sys.version_info < (2, 7): - # These tests require Python >=2.7. - del test_fixup_expected_failures, test_fixup_expected_errors, test_fixup_unexpected_success - class TestFilterCommand(TestCase): diff --git a/python/subunit/tests/test_test_protocol.py b/python/subunit/tests/test_test_protocol.py index 70e3564..a498b33 100644 --- a/python/subunit/tests/test_test_protocol.py +++ b/python/subunit/tests/test_test_protocol.py @@ -20,7 +20,6 @@ import os import tempfile import unittest -import six from testtools import PlaceHolder, skipIf, TestCase, TestResult from testtools.compat import _b, _u try: @@ -65,21 +64,13 @@ class TestHelpers(TestCase): fd, file_path = tempfile.mkstemp() self.addCleanup(os.remove, file_path) fake_file = os.fdopen(fd, 'r') - if six.PY3: - self.assertEqual(fake_file.buffer, - subunit._unwrap_text(fake_file)) - else: - self.assertEqual(fake_file, subunit._unwrap_text(fake_file)) + self.assertEqual(fake_file.buffer, subunit._unwrap_text(fake_file)) def test__unwrap_text_file_write_mode(self): fd, file_path = tempfile.mkstemp() self.addCleanup(os.remove, file_path) fake_file = os.fdopen(fd, 'w') - if six.PY3: - self.assertEqual(fake_file.buffer, - subunit._unwrap_text(fake_file)) - else: - self.assertEqual(fake_file, subunit._unwrap_text(fake_file)) + self.assertEqual(fake_file.buffer, subunit._unwrap_text(fake_file)) def test__unwrap_text_fileIO_read_mode(self): fd, file_path = tempfile.mkstemp() @@ -157,20 +148,14 @@ class TestTestProtocolServerPipe(unittest.TestCase): protocol.readFrom(pipe) bing = subunit.RemotedTestCase("bing crosby") an_error = subunit.RemotedTestCase("an error") - if six.PY3: - self.assertEqual(client.errors, - [(an_error, _remote_exception_repr + '\n')]) - self.assertEqual( - client.failures, - [(bing, _remote_exception_repr + ": " - + details_to_str({'traceback': text_content(traceback)}) + "\n")]) - else: - self.assertEqual(client.errors, - [(an_error, '_StringException\n')]) - self.assertEqual( - client.failures, - [(bing, "_StringException: " - + details_to_str({'traceback': text_content(traceback)}) + "\n")]) + self.assertEqual( + client.errors, [(an_error, _remote_exception_repr + '\n')], + ) + self.assertEqual( + client.failures, + [(bing, _remote_exception_repr + ": " + + details_to_str({'traceback': text_content(traceback)}) + "\n")], + ) self.assertEqual(client.testsRun, 3) def test_non_test_characters_forwarded_immediately(self): @@ -1024,14 +1009,9 @@ class TestRemotedTestCase(unittest.TestCase): "'A test description'>", "%r" % test) result = unittest.TestResult() test.run(result) - if six.PY3: - self.assertEqual([(test, _remote_exception_repr + ': ' + - "Cannot run RemotedTestCases.\n\n")], - result.errors) - else: - self.assertEqual([(test, "_StringException: " + - "Cannot run RemotedTestCases.\n\n")], - result.errors) + self.assertEqual([(test, _remote_exception_repr + ': ' + + "Cannot run RemotedTestCases.\n\n")], + result.errors) self.assertEqual(1, result.testsRun) another_test = subunit.RemotedTestCase("A test description") self.assertEqual(test, another_test) diff --git a/python/subunit/tests/test_test_results.py b/python/subunit/tests/test_test_results.py index add30bb..a0efa80 100644 --- a/python/subunit/tests/test_test_results.py +++ b/python/subunit/tests/test_test_results.py @@ -380,10 +380,7 @@ class TestByTestResultTests(testtools.TestCase): super(TestByTestResultTests, self).setUp() self.log = [] self.result = subunit.test_results.TestByTestResult(self.on_test) - if sys.version_info >= (3, 0): - self.result._now = iter(range(5)).__next__ - else: - self.result._now = iter(range(5)).next + self.result._now = iter(range(5)).__next__ def assertCalled(self, **kwargs): defaults = { @@ -539,10 +536,7 @@ class TestCsvResult(testtools.TestCase): def test_csv_output(self): stream = StringIO() result = subunit.test_results.CsvResult(stream) - if sys.version_info >= (3, 0): - result._now = iter(range(5)).__next__ - else: - result._now = iter(range(5)).next + result._now = iter(range(5)).__next__ result.startTestRun() result.startTest(self) result.addSuccess(self) |