diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2011-03-20 16:42:55 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2011-03-20 16:42:55 (GMT) |
| commit | ec60e31badeffe06ecddb77f0d02dc9a2d6e391b (patch) | |
| tree | c4931707f4b973d616d778b9098ea4074b75570e | |
| parent | 68c9592d3306ea12d249ecdbc5ee837b10f3ea12 (diff) | |
| parent | 7903cb727ed841918c5b3bfeda28b0d6e54180b4 (diff) | |
| download | cpython-ec60e31badeffe06ecddb77f0d02dc9a2d6e391b.zip cpython-ec60e31badeffe06ecddb77f0d02dc9a2d6e391b.tar.gz cpython-ec60e31badeffe06ecddb77f0d02dc9a2d6e391b.tar.bz2 | |
Merge
| -rw-r--r-- | Lib/test/test_pty.py | 7 | ||||
| -rw-r--r-- | Lib/test/test_signal.py | 9 |
2 files changed, 11 insertions, 5 deletions
diff --git a/Lib/test/test_pty.py b/Lib/test/test_pty.py index 92039e4..c6fc5e7 100644 --- 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 @@ class PtyTest(unittest.TestCase): # 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 index 8f9b064..f64bd4c 100644 --- a/Lib/test/test_signal.py +++ b/Lib/test/test_signal.py @@ -484,9 +484,12 @@ class ItimerTest(unittest.TestCase): 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__": |