diff options
author | Mariusz Felisiak <felisiak.mariusz@gmail.com> | 2021-01-19 08:35:16 +0100 |
---|---|---|
committer | Carlton Gibson <carlton@noumenal.es> | 2021-02-10 10:20:54 +0100 |
commit | ec0ff406311de88f4e2a135d784363424fe602aa (patch) | |
tree | c1659b85ea145704a1b733d40a6a9a45e9332d0f /tests/test_runner | |
parent | 9c6ba876928fd20194ac3238dc06aeae66d7bd50 (diff) | |
download | django-ec0ff406311de88f4e2a135d784363424fe602aa.tar.gz |
Fixed #32355 -- Dropped support for Python 3.6 and 3.7
Diffstat (limited to 'tests/test_runner')
-rw-r--r-- | tests/test_runner/test_discover_runner.py | 6 | ||||
-rw-r--r-- | tests/test_runner/test_parallel.py | 6 |
2 files changed, 3 insertions, 9 deletions
diff --git a/tests/test_runner/test_discover_runner.py b/tests/test_runner/test_discover_runner.py index 183e283d08..ee95f9da72 100644 --- a/tests/test_runner/test_discover_runner.py +++ b/tests/test_runner/test_discover_runner.py @@ -1,9 +1,7 @@ import os from argparse import ArgumentParser from contextlib import contextmanager -from unittest import ( - TestSuite, TextTestRunner, defaultTestLoader, mock, skipUnless, -) +from unittest import TestSuite, TextTestRunner, defaultTestLoader, mock from django.db import connections from django.test import SimpleTestCase @@ -11,7 +9,6 @@ from django.test.runner import DiscoverRunner from django.test.utils import ( NullTimeKeeper, TimeKeeper, captured_stderr, captured_stdout, ) -from django.utils.version import PY37 @contextmanager @@ -83,7 +80,6 @@ class DiscoverRunnerTests(SimpleTestCase): self.assertEqual(count, 1) - @skipUnless(PY37, 'unittest -k option requires Python 3.7 and later') def test_name_patterns(self): all_test_1 = [ 'DjangoCase1.test_1', 'DjangoCase2.test_1', diff --git a/tests/test_runner/test_parallel.py b/tests/test_runner/test_parallel.py index c1a89bd0f0..70959012b5 100644 --- a/tests/test_runner/test_parallel.py +++ b/tests/test_runner/test_parallel.py @@ -2,7 +2,6 @@ import unittest from django.test import SimpleTestCase from django.test.runner import RemoteTestResult -from django.utils.version import PY37 try: import tblib @@ -80,8 +79,7 @@ class RemoteTestResultTest(SimpleTestCase): event = events[1] self.assertEqual(event[0], 'addSubTest') self.assertEqual(str(event[2]), 'dummy_test (test_runner.test_parallel.SampleFailingSubtest) (index=0)') - trailing_comma = '' if PY37 else ',' - self.assertEqual(repr(event[3][1]), "AssertionError('0 != 1'%s)" % trailing_comma) + self.assertEqual(repr(event[3][1]), "AssertionError('0 != 1')") event = events[2] - self.assertEqual(repr(event[3][1]), "AssertionError('2 != 1'%s)" % trailing_comma) + self.assertEqual(repr(event[3][1]), "AssertionError('2 != 1')") |