From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 29 Dec 2009 00:38:47 +0000 (+0000)
Subject: Merged revisions 77104 via svnmerge from
X-Git-Tag: v3.2a1~1954
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e61fab36fe5b6e6fdae6acb47232a836dbfc580c;p=thirdparty%2FPython%2Fcpython.git

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 12bcac08c90f..0d6f9a36a6ea 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