Changeset 391 for python/trunk/Lib/test/test_lib2to3.py

Timestamp:

Mar 19, 2014, 11:31:01 PM (11 years ago)

Author:

dmik

Message:

python: Merge vendor 2.7.6 to trunk.

Location:

python/trunk

Files:

• . (modified) (1 prop)
• Lib/test/test_lib2to3.py (modified) (2 diffs)

python/trunk/Lib/test/test_lib2to3.py

@@ -1 +1 @@
 # 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_parser, test_main as test_main_)
 import unittest
 from test.test_support import run_unittest
@@ -8 +9 @@
     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_parser,
+              test_main_):
         tests.addTests(loader.loadTestsFromModule(m))
     return tests