cpython: d825316b73d0 (original) (raw)

Mercurial > cpython

changeset 68760:d825316b73d0

Merge

Antoine Pitrou solipsis@pitrou.net
date	Sun, 20 Mar 2011 17:42:55 +0100
parents	c70d252135da(current diff)adbdb3e74461(diff)
children	13a74990db8c
files
diffstat	2 files changed, 11 insertions(+), 5 deletions(-)[+] [-] Lib/test/test_pty.py 7 Lib/test/test_signal.py 9

line wrap: on

line diff

--- 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)[](#l1.15)
```
finally:
```
   reap_children()[](#l1.17)
```

if name == "main": test_main()

--- 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,[](#l2.8)

                    ItimerTest, WindowsSignalTests)[](#l2.9)

try:

   support.run_unittest(BasicSignalTests, InterProcessSignalTests,[](#l2.11)

                        WakeupSignalTests, SiginterruptTest,[](#l2.12)

                        ItimerTest, WindowsSignalTests)[](#l2.13)

finally:
```
   support.reap_children()[](#l2.15)
```

if name == "main":