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
........

diff --git a/Lib/test/test_lib2to3.py b/Lib/test/test_lib2to3.py
index 12bcac08c90f85dd39d8a265b4520c7a4089415b..0d6f9a36a6eadeb2a088c2a2a9308348b53a273b 100644 (file)
--- 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