[Python-3000-checkins] r65106 - in python/branches/py3k: Lib/test/regrtest.py Lib/test/test_lib2to3.py

[benjamin.peterson]

Author: benjamin.peterson
Date: Fri Jul 18 16:35:44 2008
New Revision: 65106

Log:
Merged revisions 65104 via svnmerge from
svn+ssh://pythondev at 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
........


Modified:
python/branches/py3k/ (props changed)
python/branches/py3k/Lib/test/regrtest.py
python/branches/py3k/Lib/test/test_lib2to3.py

Modified: python/branches/py3k/Lib/test/regrtest.py
==============================================================================
--- python/branches/py3k/Lib/test/regrtest.py (original)
+++ python/branches/py3k/Lib/test/regrtest.py Fri Jul 18 16:35:44 2008
@@ -175,8 +175,8 @@

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):

Modified: python/branches/py3k/Lib/test/test_lib2to3.py
==============================================================================
--- python/branches/py3k/Lib/test/test_lib2to3.py (original)
+++ python/branches/py3k/Lib/test/test_lib2to3.py Fri Jul 18 16:35:44 2008
@@ -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()