summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregory P. Smith <greg@krypto.org>2011-03-15 15:43:39 -0400
committerGregory P. Smith <greg@krypto.org>2011-03-15 15:43:39 -0400
commit3b4652e0748a45068430bd44301a49371cd65f69 (patch)
tree693f27382b2d4148dad093549e7063ec8bca978e
parent6466a5268ae56d1bdb9b4229c801d360b2448de9 (diff)
downloadcpython-git-3b4652e0748a45068430bd44301a49371cd65f69.tar.gz
revert the test_main() change from 08daf3ef6509 so that regrtest continues to run this properly.
-rw-r--r--Lib/test/test_subprocess.py15
1 files changed, 14 insertions, 1 deletions
diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py
index 92b61a9698..5f158b9b64 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()