Merged revisions 65104 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r65104 | benjamin.peterson | 2008-07-18 09:26:35 -0500 (Fri, 18 Jul 2008) | 2 lines

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

diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py
index d47fde38e83f08485b8ce23d7aa53d6b7abe57f7..0c6d52211092d1154b3b77178d1d75dfc6e59d42 100755 (executable)
--- a/Lib/test/regrtest.py
+++ b/Lib/test/regrtest.py
@@ -175,8 +175,8 @@ if sys.platform == 'darwin':
 
 from test import 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(msg):

diff --git a/Lib/test/test_lib2to3.py b/Lib/test/test_lib2to3.py
index 3af6afa6d468e3fa9429d03e2a488e503df023e8..9bd4496726a1c5d3ea6bece232ea856ca71e94e1 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.support import run_unittest, requires
-
-# Don't run lib2to3 tests by default since they take too long
-if __name__ != '__main__':
-    requires('lib2to3')
+from test.support import run_unittest
 
 def suite():
     tests = unittest.TestSuite()