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 c3ea567103275de3ef0e810f0fec18e8102fe054..4b16ecc31156a512db4a28fe272e5339994a4538 100644 (file)
--- 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)