changeset:   89997:07984815003f
branch:      3.4
parent:      89989:adf1e04478b4
user:        Yury Selivanov <yselivanov@sprymix.com>
date:        Thu Mar 27 12:21:20 2014 -0400
files:       Lib/test/test_asyncio/__init__.py Misc/NEWS
description:
asyncio.tests: Autodiscover asyncio tests. Patch by Vajrasky Kok. Closes #20668


diff -r adf1e04478b4 -r 07984815003f Lib/test/test_asyncio/__init__.py
--- a/Lib/test/test_asyncio/__init__.py	Thu Mar 27 01:39:28 2014 -0700
+++ b/Lib/test/test_asyncio/__init__.py	Thu Mar 27 12:21:20 2014 -0400
@@ -10,20 +10,18 @@
 
 
 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 -r adf1e04478b4 -r 07984815003f Misc/NEWS
--- a/Misc/NEWS	Thu Mar 27 01:39:28 2014 -0700
+++ b/Misc/NEWS	Thu Mar 27 12:21:20 2014 -0400
@@ -107,6 +107,9 @@
   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
 -----------