summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2009-12-29 00:38:47 (GMT)
committerBenjamin Peterson <benjamin@python.org>2009-12-29 00:38:47 (GMT)
commite61fab36fe5b6e6fdae6acb47232a836dbfc580c (patch)
tree36f5082c7c1f0859444a5423a71e16e9500e8dc6
parent60a9c69c5e7b4ed4aef3903a7fa031d08c6b1979 (diff)
downloadcpython-e61fab36fe5b6e6fdae6acb47232a836dbfc580c.zip
cpython-e61fab36fe5b6e6fdae6acb47232a836dbfc580c.tar.gz
cpython-e61fab36fe5b6e6fdae6acb47232a836dbfc580c.tar.bz2
Merged revisions 77104 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r77104 | benjamin.peterson | 2009-12-28 18:09:33 -0600 (Mon, 28 Dec 2009) | 1 line enable test_main.py ........
-rw-r--r--Lib/test/test_lib2to3.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/Lib/test/test_lib2to3.py b/Lib/test/test_lib2to3.py
index 12bcac0..0d6f9a3 100644
--- a/Lib/test/test_lib2to3.py
+++ b/Lib/test/test_lib2to3.py
@@ -1,13 +1,15 @@
# Skipping test_parser and test_all_fixers
# because of running
-from lib2to3.tests import test_fixers, test_pytree, test_util, test_refactor
+from lib2to3.tests import (test_fixers, test_pytree, test_util, test_refactor,
+ test_main as test_main_)
import unittest
from test.support import run_unittest
def suite():
tests = unittest.TestSuite()
loader = unittest.TestLoader()
- for m in (test_fixers,test_pytree,test_util, test_refactor):
+ for m in (test_fixers, test_pytree,test_util, test_refactor,
+ test_main_):
tests.addTests(loader.loadTestsFromModule(m))
return tests