From 5a722409ee2aed97d18f2646a30178171167c028 Mon Sep 17 00:00:00 2001 From: Benjamin Peterson Date: Fri, 18 Jul 2008 14:35:44 +0000 Subject: 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 ........ --- Lib/test/regrtest.py | 4 ++-- Lib/test/test_lib2to3.py | 6 +----- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py index d47fde3..0c6d522 100755 --- 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 3af6afa..9bd4496 100644 --- 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() -- cgit v0.12