summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2017-11-22 19:58:59 (GMT)
committerGitHub <noreply@github.com>2017-11-22 19:58:59 (GMT)
commitbb11c3c967afaf263e00844d4ab461b7fafd6d36 (patch)
treead53549aa12c0ed11c55700f18415f0df83d10e6
parent803ddd8ce22f0de3ab42fb98a225a704c000ef06 (diff)
downloadcpython-bb11c3c967afaf263e00844d4ab461b7fafd6d36.zip
cpython-bb11c3c967afaf263e00844d4ab461b7fafd6d36.tar.gz
cpython-bb11c3c967afaf263e00844d4ab461b7fafd6d36.tar.bz2
bpo-31324: Fix test.support.set_match_tests(None) (#4505)
-rw-r--r--Lib/test/support/__init__.py2
-rw-r--r--Lib/test/test_support.py5
2 files changed, 7 insertions, 0 deletions
diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py
index 71d9c2c..b7cbdc6 100644
--- a/Lib/test/support/__init__.py
+++ b/Lib/test/support/__init__.py
@@ -1931,6 +1931,8 @@ def set_match_tests(patterns):
if not patterns:
func = None
+ # set_match_tests(None) behaves as set_match_tests(())
+ patterns = ()
elif all(map(_is_full_match_test, patterns)):
# Simple case: all patterns are full test identifier.
# The test.bisect utility only uses such full test identifiers.
diff --git a/Lib/test/test_support.py b/Lib/test/test_support.py
index 4756def..e06f7b8 100644
--- a/Lib/test/test_support.py
+++ b/Lib/test/test_support.py
@@ -500,6 +500,11 @@ class TestSupport(unittest.TestCase):
self.assertTrue(support.match_test(test_access))
self.assertTrue(support.match_test(test_chdir))
+ # match all using None
+ support.set_match_tests(None)
+ self.assertTrue(support.match_test(test_access))
+ self.assertTrue(support.match_test(test_chdir))
+
# match the full test identifier
support.set_match_tests([test_access.id()])
self.assertTrue(support.match_test(test_access))