From: Gregory P. Smith <greg@krypto.org>
Date: Tue, 15 Mar 2011 19:43:39 +0000 (-0400)
Subject: revert the test_main() change from 08daf3ef6509 so that regrtest continues to run... 
X-Git-Tag: v3.3.0a1~2905^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3b4652e0748a45068430bd44301a49371cd65f69;p=thirdparty%2FPython%2Fcpython.git

revert the test_main() change from 08daf3ef6509 so that regrtest continues to run this properly.
---

diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py
index 92b61a969878..5f158b9b64fa 100644
--- a/Lib/test/test_subprocess.py
+++ b/Lib/test/test_subprocess.py
@@ -1547,6 +1547,19 @@ class ContextManagerTests(ProcessTestCase):
                 raise c.exception
 
 
+def test_main():
+    unit_tests = (ProcessTestCase,
+                  POSIXProcessTestCase,
+                  Win32ProcessTestCase,
+                  ProcessTestCasePOSIXPurePython,
+                  CommandTests,
+                  ProcessTestCaseNoPoll,
+                  HelperFunctionTests,
+                  CommandsWithSpaces,
+                  ContextManagerTests)
+
+    support.run_unittest(*unit_tests)
+    support.reap_children()
+
 if __name__ == "__main__":
     unittest.main()
-    support.reap_children()