#11093: make NOTTESTS empty by renaming confusingly named files in test dir.

Patch by Sandro Tosi.

diff --git a/Lib/test/test_future1.py b/Lib/test/future_test1.py
similarity index 100%
rename from Lib/test/test_future1.py
rename to Lib/test/future_test1.py

diff --git a/Lib/test/test_future2.py b/Lib/test/future_test2.py
similarity index 100%
rename from Lib/test/test_future2.py
rename to Lib/test/future_test2.py

diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py
index ca9e9f4f7708bda8ce329837651a67a7627d8f1d..f6cf0a7c65d09576a35b0dc3c8588cc1c40dc22b 100755 (executable)
--- a/Lib/test/regrtest.py
+++ b/Lib/test/regrtest.py
@@ -743,10 +743,7 @@ STDTESTS = [
 ]
 
 # set of tests that we don't want to be executed when using regrtest
-NOTTESTS = {
-    'test_future1',
-    'test_future2',
-}
+NOTTESTS = set()
 
 def findtests(testdir=None, stdtests=STDTESTS, nottests=NOTTESTS):
     """Return a list of all applicable test modules."""

diff --git a/Lib/test/test_future.py b/Lib/test/test_future.py
index c6689a1a18df48da9ea8b53d88b215b5b150a7ce..3a25eb156508029adeec8a5c98cc8ea55f7c3a9f 100644 (file)
--- a/Lib/test/test_future.py
+++ b/Lib/test/test_future.py
@@ -13,14 +13,14 @@ def get_error_location(msg):
 class FutureTest(unittest.TestCase):
 
     def test_future1(self):
-        support.unload('test_future1')
-        from test import test_future1
-        self.assertEqual(test_future1.result, 6)
+        support.unload('future_test1')
+        from test import future_test1
+        self.assertEqual(future_test1.result, 6)
 
     def test_future2(self):
-        support.unload('test_future2')
-        from test import test_future2
-        self.assertEqual(test_future2.result, 6)
+        support.unload('future_test2')
+        from test import future_test2
+        self.assertEqual(future_test2.result, 6)
 
     def test_future3(self):
         support.unload('test_future3')