[Python-checkins] cpython: #11093: make NOTTESTS empty by renaming confusingly named files in test dir.

[r.david.murray]

http://hg.python.org/cpython/rev/6a649a15cd14
changeset:   68905:6a649a15cd14
user:        R David Murray <rdmurray at bitdance.com>
date:        Thu Mar 24 14:57:05 2011 -0400
summary:
  #11093: make NOTTESTS empty by renaming confusingly named files in test dir.

Patch by Sandro Tosi.

files:
  Lib/test/test_future1.py |  Bin 
  Lib/test/test_future2.py |  Bin 
  Lib/test/regrtest.py     |    5 +----
  Lib/test/test_future.py  |   12 ++++++------
  4 files changed, 7 insertions(+), 10 deletions(-)


diff --git a/Lib/test/test_future1.py b/Lib/test/future_test1.py
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
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
--- a/Lib/test/regrtest.py
+++ b/Lib/test/regrtest.py
@@ -743,10 +743,7 @@
 ]
 
 # 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
--- a/Lib/test/test_future.py
+++ b/Lib/test/test_future.py
@@ -13,14 +13,14 @@
 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')

-- 
Repository URL: http://hg.python.org/cpython