asyncio.tests: Autodiscover asyncio tests. Patch by Vajrasky Kok. Closes #20668

diff --git a/Lib/test/test_asyncio/__init__.py b/Lib/test/test_asyncio/__init__.py
index 23ce5e8059567e050e7d5fe772dd62d89468fee6..82158af77ddcb6b3f44630f4f3d88bbb57c99820 100644 (file)
--- a/Lib/test/test_asyncio/__init__.py
+++ b/Lib/test/test_asyncio/__init__.py
@@ -10,20 +10,18 @@ import_module('concurrent.futures')
 
 
 def suite():
-    tests_file = os.path.join(os.path.dirname(__file__), 'tests.txt')
-    with open(tests_file) as fp:
-        test_names = fp.read().splitlines()
     tests = unittest.TestSuite()
     loader = unittest.TestLoader()
-    for test_name in test_names:
-        mod_name = 'test.' + test_name
-        try:
-            __import__(mod_name)
-        except unittest.SkipTest:
-            pass
-        else:
-            mod = sys.modules[mod_name]
-            tests.addTests(loader.loadTestsFromModule(mod))
+    for fn in os.listdir(os.path.dirname(__file__)):
+        if fn.startswith("test") and fn.endswith(".py"):
+            mod_name = 'test.test_asyncio.' + fn[:-3]
+            try:
+                __import__(mod_name)
+            except unittest.SkipTest:
+                pass
+            else:
+                mod = sys.modules[mod_name]
+                tests.addTests(loader.loadTestsFromModule(mod))
     return tests
 
 

diff --git a/Misc/NEWS b/Misc/NEWS
index 59e6d1c69494c8b529d160a38878c9ee411ffc78..8f55c63508682b507095045e90dfb282a0876cdb 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -107,6 +107,9 @@ Tests
   redirect of http://www.python.org/ to https://www.python.org:
   use http://www.example.com instead.
 
+- Issue #20668: asyncio tests no longer rely on tests.txt file.
+  (Patch by Vajrasky Kok)
+
 Tools/Demos
 -----------