From: Carsten Schoenert Date: Mon, 28 Nov 2022 14:43:49 +0100 Subject: tests: Drop various python version handling There are no differences in the exception strings between Python 3.10 and 3.11 and some of the if..else switches are not needed and provoke the test to fail within Python 3.11. Forwarded: Not-Needed --- tests/test_test.py | 218 ++++++++++++++++------------------------------------- 1 file changed, 65 insertions(+), 153 deletions(-) diff --git a/tests/test_test.py b/tests/test_test.py index 60d523a..ba8a7ac 100644 --- a/tests/test_test.py +++ b/tests/test_test.py @@ -101,24 +101,14 @@ class TestRunnerTests(SimpleTestCase): result = self.run_test("does_not_exist") assert result.returncode == 1 lines = result.stderr.splitlines() - if sys.version_info >= (3, 11): - assert lines[:6] == [ - "E", - "─" * 80, - "ERROR: does_not_exist (unittest.loader._FailedTest.does_not_exist)", - "─" * 80, - "ImportError: Failed to import test module: does_not_exist", - "Traceback (most recent call last):", - ] - else: - assert lines[:6] == [ - "E", - "─" * 80, - "ERROR: does_not_exist (unittest.loader._FailedTest)", - "─" * 80, - "ImportError: Failed to import test module: does_not_exist", - "Traceback (most recent call last):", - ] + assert lines[:6] == [ + "E", + "─" * 80, + "ERROR: does_not_exist (unittest.loader._FailedTest)", + "─" * 80, + "ImportError: Failed to import test module: does_not_exist", + "Traceback (most recent call last):", + ] def test_pass_quiet(self): result = self.run_test("-v", "0", f"{__name__}.ExampleTests.test_pass") @@ -139,125 +129,76 @@ class TestRunnerTests(SimpleTestCase): result = self.run_test("-v", "2", f"{__name__}.ExampleTests.test_pass") assert result.returncode == 0 lines = result.stderr.splitlines() - if sys.version_info >= (3, 11): - assert lines[1:4] == [ - "test_pass (tests.test_test.ExampleTests.test_pass) ... ok", - "", - "-" * 70, - ] - else: - assert lines[1:4] == [ - "test_pass (tests.test_test.ExampleTests) ... ok", - "", - "-" * 70, - ] + assert lines[1:4] == [ + "test_pass (tests.test_test.ExampleTests) ... ok", + "", + "-" * 70, + ] def test_error_quiet(self): result = self.run_test("-v", "0", f"{__name__}.ExampleTests.test_error") assert result.returncode == 1 lines = result.stderr.splitlines() - if sys.version_info >= (3, 11): - assert lines[:2] == [ - "─" * 80, - "ERROR: test_error (tests.test_test.ExampleTests.test_error)", - ] - else: - assert lines[:2] == [ - "─" * 80, - "ERROR: test_error (tests.test_test.ExampleTests)", - ] + assert lines[:2] == [ + "─" * 80, + "ERROR: test_error (tests.test_test.ExampleTests)", + ] assert "─ locals ─" in result.stderr def test_error_normal(self): result = self.run_test(f"{__name__}.ExampleTests.test_error") assert result.returncode == 1 lines = result.stderr.splitlines() - if sys.version_info >= (3, 11): - assert lines[1:4] == [ - "E", - "─" * 80, - "ERROR: test_error (tests.test_test.ExampleTests.test_error)", - ] - else: - assert lines[1:4] == [ - "E", - "─" * 80, - "ERROR: test_error (tests.test_test.ExampleTests)", - ] + assert lines[1:4] == [ + "E", + "─" * 80, + "ERROR: test_error (tests.test_test.ExampleTests)", + ] assert "─ locals ─" in result.stderr def test_error_verbose(self): result = self.run_test("-v", "2", f"{__name__}.ExampleTests.test_error") assert result.returncode == 1 lines = result.stderr.splitlines() - if sys.version_info >= (3, 11): - assert lines[1:5] == [ - "test_error (tests.test_test.ExampleTests.test_error) ... ERROR", - "", - "─" * 80, - "ERROR: test_error (tests.test_test.ExampleTests.test_error)", - ] - else: - assert lines[1:5] == [ - "test_error (tests.test_test.ExampleTests) ... ERROR", - "", - "─" * 80, - "ERROR: test_error (tests.test_test.ExampleTests)", - ] + assert lines[1:5] == [ + "test_error (tests.test_test.ExampleTests) ... ERROR", + "", + "─" * 80, + "ERROR: test_error (tests.test_test.ExampleTests)", + ] assert "─ locals ─" in result.stderr def test_failure_quiet(self): result = self.run_test("-v", "0", f"{__name__}.ExampleTests.test_failure") assert result.returncode == 1 lines = result.stderr.splitlines() - if sys.version_info >= (3, 11): - assert lines[:2] == [ - "─" * 80, - "FAIL: test_failure (tests.test_test.ExampleTests.test_failure)", - ] - else: - assert lines[:2] == [ - "─" * 80, - "FAIL: test_failure (tests.test_test.ExampleTests)", - ] + assert lines[:2] == [ + "─" * 80, + "FAIL: test_failure (tests.test_test.ExampleTests)", + ] assert "─ locals ─" in result.stderr def test_failure_normal(self): result = self.run_test(f"{__name__}.ExampleTests.test_failure") assert result.returncode == 1 lines = result.stderr.splitlines() - if sys.version_info >= (3, 11): - assert lines[1:4] == [ - "F", - "─" * 80, - "FAIL: test_failure (tests.test_test.ExampleTests.test_failure)", - ] - else: - assert lines[1:4] == [ - "F", - "─" * 80, - "FAIL: test_failure (tests.test_test.ExampleTests)", - ] + assert lines[1:4] == [ + "F", + "─" * 80, + "FAIL: test_failure (tests.test_test.ExampleTests)", + ] assert "─ locals ─" in result.stderr def test_failure_verbose(self): result = self.run_test("-v", "2", f"{__name__}.ExampleTests.test_failure") assert result.returncode == 1 lines = result.stderr.splitlines() - if sys.version_info >= (3, 11): - assert lines[1:5] == [ - "test_failure (tests.test_test.ExampleTests.test_failure) ... FAIL", - "", - "─" * 80, - "FAIL: test_failure (tests.test_test.ExampleTests.test_failure)", - ] - else: - assert lines[1:5] == [ - "test_failure (tests.test_test.ExampleTests) ... FAIL", - "", - "─" * 80, - "FAIL: test_failure (tests.test_test.ExampleTests)", - ] + assert lines[1:5] == [ + "test_failure (tests.test_test.ExampleTests) ... FAIL", + "", + "─" * 80, + "FAIL: test_failure (tests.test_test.ExampleTests)", + ] assert "─ locals ─" in result.stderr def test_skip_quiet(self): @@ -282,7 +223,7 @@ class TestRunnerTests(SimpleTestCase): if sys.version_info >= (3, 11): assert lines[1:4] == [ ( - "test_skip (tests.test_test.ExampleTests.test_skip) ... " + "test_skip (tests.test_test.ExampleTests) ... " + "skipped 'some reason'" ), "", @@ -318,24 +259,14 @@ class TestRunnerTests(SimpleTestCase): ) assert result.returncode == 0 lines = result.stderr.splitlines() - if sys.version_info >= (3, 11): - assert lines[1:4] == [ - ( - "test_expected_failure (tests.test_test.ExampleTests." - + "test_expected_failure) ... expected failure" - ), - "", - "-" * 70, - ] - else: - assert lines[1:4] == [ - ( - "test_expected_failure (tests.test_test.ExampleTests) ... " - + "expected failure" - ), - "", - "-" * 70, - ] + assert lines[1:4] == [ + ( + "test_expected_failure (tests.test_test.ExampleTests)" + + " ... expected failure" + ), + "", + "-" * 70, + ] def test_unexpected_success_quiet(self): result = self.run_test( @@ -347,10 +278,7 @@ class TestRunnerTests(SimpleTestCase): else: assert result.returncode == 0 lines = result.stderr.splitlines() - if sys.version_info >= (3, 11): - assert lines[:1] == ["=" * 70] - else: - assert lines[:1] == ["-" * 70] + assert lines[:1] == ["-" * 70] def test_unexpected_success_normal(self): result = self.run_test(f"{__name__}.ExampleTests.test_unexpected_success") @@ -360,16 +288,10 @@ class TestRunnerTests(SimpleTestCase): else: assert result.returncode == 0 lines = result.stderr.splitlines() - if sys.version_info >= (3, 11): - assert lines[1:3] == [ - "u", - "=" * 70, - ] - else: - assert lines[1:3] == [ - "u", - "-" * 70, - ] + assert lines[1:3] == [ + "u", + "-" * 70, + ] def test_unexpected_success_verbose(self): result = self.run_test( @@ -380,24 +302,14 @@ class TestRunnerTests(SimpleTestCase): else: assert result.returncode == 0 lines = result.stderr.splitlines() - if sys.version_info >= (3, 11): - assert lines[1:4] == [ - ( - "test_unexpected_success (tests.test_test.ExampleTests." - + "test_unexpected_success) ... unexpected success" - ), - "", - "=" * 70, - ] - else: - assert lines[1:4] == [ - ( - "test_unexpected_success (tests.test_test.ExampleTests) " - + "... unexpected success" - ), - "", - "-" * 70, - ] + assert lines[1:4] == [ + ( + "test_unexpected_success (tests.test_test.ExampleTests) " + + "... unexpected success" + ), + "", + "-" * 70, + ] def test_debug_sql(self): result = self.run_test(