now that test_lib2to3 actually works and isn't extremely slow, we don't need the...

diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py
index b27e53bfe1bc2d845b5cc861fe1abf7cfe39460a..f185111fc36824b6ab6e12367ab3b95547bb1516 100755 (executable)
--- a/Lib/test/regrtest.py
+++ b/Lib/test/regrtest.py
@@ -167,8 +167,8 @@ if sys.platform == 'darwin':
 
 from test import test_support
 
-RESOURCE_NAMES = ('audio', 'curses', 'lib2to3', 'largefile', 'network',
-                  'bsddb', 'decimal', 'compiler', 'subprocess', 'urlfetch')
+RESOURCE_NAMES = ('audio', 'curses', 'largefile', 'network', 'bsddb',
+                  'decimal', 'compiler', 'subprocess', 'urlfetch')
 
 
 def usage(code, msg=''):

diff --git a/Lib/test/test_lib2to3.py b/Lib/test/test_lib2to3.py
index 6d589d8905816e2f82396f6c6730b8a9582d2a5e..161b9ddd242eb68a115969bd8f3a0d7776495068 100644 (file)
--- a/Lib/test/test_lib2to3.py
+++ b/Lib/test/test_lib2to3.py
@@ -2,11 +2,7 @@
 # because of running
 from lib2to3.tests import test_fixers, test_pytree, test_util
 import unittest
-from test.test_support import run_unittest, requires
-
-# Don't run lib2to3 tests by default since they take too long
-if __name__ != '__main__':
-    requires('lib2to3')
+from test.test_support import run_unittest
 
 def suite():
     tests = unittest.TestSuite()