From: R David Murray <rdmurray@bitdance.com>
Date: Thu, 24 Mar 2011 18:57:05 +0000 (-0400)
Subject: #11093: make NOTTESTS empty by renaming confusingly named files in test dir.
X-Git-Tag: v3.3.0a1~2765^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=576483085c7357130afba7f605db431df255ec74;p=python

#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 ca9e9f4f77..f6cf0a7c65 100755
--- 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 c6689a1a18..3a25eb1565 100644
--- 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')