From: Nikita Sobolev <mail@sobolevn.me>
Date: Sat, 21 Oct 2023 11:26:03 +0000 (+0300)
Subject: gh-110974: Make sure all test_zoneinfo tests are collected (GH-110975)
X-Git-Tag: v3.13.0a2~376
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=86276fe4f8e0801f1194b55fa8d8cb7dbf8ee658;p=thirdparty%2FPython%2Fcpython.git

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.
---

diff --git a/Lib/test/test_zoneinfo/__init__.py b/Lib/test/test_zoneinfo/__init__.py
index c3ea56710327..4b16ecc31156 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)