[Python-checkins] cpython (merge 3.2 -> default): Merge (original) (raw)
antoine.pitrou python-checkins at python.org
Sun Mar 20 17:43:02 CET 2011
- Previous message: [Python-checkins] cpython (merge 3.1 -> 3.2): Merge
- Next message: [Python-checkins] cpython (2.7): the name of the option is a bit too low-level
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
http://hg.python.org/cpython/rev/d825316b73d0 changeset: 68760:d825316b73d0 parent: 68757:c70d252135da parent: 68759:adbdb3e74461 user: Antoine Pitrou <solipsis at pitrou.net> date: Sun Mar 20 17:42:55 2011 +0100 summary: Merge
files:
diff --git a/Lib/test/test_pty.py b/Lib/test/test_pty.py --- a/Lib/test/test_pty.py +++ b/Lib/test/test_pty.py @@ -1,4 +1,4 @@ -from test.support import verbose, run_unittest, import_module +from test.support import verbose, run_unittest, import_module, reap_children
#Skip these tests if either fcntl or termios is not available fcntl = import_module('fcntl') @@ -195,7 +195,10 @@ # pty.fork() passed.
def test_main(verbose=None):
- run_unittest(PtyTest)
- try:
run_unittest(PtyTest)- finally:
reap_children()
if name == "main": test_main() diff --git a/Lib/test/test_signal.py b/Lib/test/test_signal.py --- a/Lib/test/test_signal.py +++ b/Lib/test/test_signal.py @@ -484,9 +484,12 @@ self.assertEqual(self.hndl_called, True)
def test_main():
- support.run_unittest(BasicSignalTests, InterProcessSignalTests,
WakeupSignalTests, SiginterruptTest,ItimerTest, WindowsSignalTests)
- try:
support.run_unittest(BasicSignalTests, InterProcessSignalTests,WakeupSignalTests, SiginterruptTest,ItimerTest, WindowsSignalTests)- finally:
support.reap_children()
if name == "main":
-- Repository URL: http://hg.python.org/cpython
- Previous message: [Python-checkins] cpython (merge 3.1 -> 3.2): Merge
- Next message: [Python-checkins] cpython (2.7): the name of the option is a bit too low-level
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]