summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNikita Sobolev <mail@sobolevn.me>2023-10-21 11:26:03 (GMT)
committerGitHub <noreply@github.com>2023-10-21 11:26:03 (GMT)
commit86276fe4f8e0801f1194b55fa8d8cb7dbf8ee658 (patch)
tree0c6397d9e525928e7fd5925ba11671ce6fa52385
parent7237fb578dc9db9dc557759a24d8083425107b91 (diff)
downloadcpython-86276fe4f8e0801f1194b55fa8d8cb7dbf8ee658.zip
cpython-86276fe4f8e0801f1194b55fa8d8cb7dbf8ee658.tar.gz
cpython-86276fe4f8e0801f1194b55fa8d8cb7dbf8ee658.tar.bz2
gh-110974: Make sure all test_zoneinfo tests are collected (GH-110975)
Test classes from the test_zoneinfo submodule were overridden by test classes from the test_zoneinfo_property submodule with the same name.
-rw-r--r--Lib/test/test_zoneinfo/__init__.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/Lib/test/test_zoneinfo/__init__.py b/Lib/test/test_zoneinfo/__init__.py
index c3ea567..4b16ecc 100644
--- a/Lib/test/test_zoneinfo/__init__.py
+++ b/Lib/test/test_zoneinfo/__init__.py
@@ -1,2 +1,5 @@
-from .test_zoneinfo import *
-from .test_zoneinfo_property import *
+import os
+from test.support import load_package_tests
+
+def load_tests(*args):
+ return load_package_tests(os.path.dirname(__file__), *args)