]> granicus.if.org Git - python/commitdiff
Remove test_sigterm().
authorRichard Oudkerk <shibturn@gmail.com>
Fri, 18 Oct 2013 13:42:56 +0000 (14:42 +0100)
committerRichard Oudkerk <shibturn@gmail.com>
Fri, 18 Oct 2013 13:42:56 +0000 (14:42 +0100)
Lib/test/_test_multiprocessing.py

index 993c8750b6cb1380a43df19052d4d2b59f9e2859..eead1427cde3fa9708a2c8ce3cecc6a0a01cbbcb 100644 (file)
@@ -273,11 +273,7 @@ class _TestProcess(BaseTestCase):
 
     @classmethod
     def _test_terminate(cls):
-        print('signal.getsignal(SIGTERM) =',
-              signal.getsignal(signal.SIGTERM), file=sys.stderr)
-        print('starting sleep', file=sys.stderr)
         time.sleep(100)
-        print('finished sleep', file=sys.stderr)
 
     def test_terminate(self):
         if self.TYPE == 'threads':
@@ -315,10 +311,6 @@ class _TestProcess(BaseTestCase):
             try:
                 signal.alarm(10)
                 self.assertEqual(join(), None)
-            except RuntimeError:
-                print('os.waitpid() =',
-                      os.waitpid(p.pid, os.WNOHANG), file=sys.stderr)
-                raise
             finally:
                 signal.alarm(0)
                 signal.signal(signal.SIGALRM, old_handler)
@@ -335,39 +327,6 @@ class _TestProcess(BaseTestCase):
         # XXX sometimes get p.exitcode == 0 on Windows ...
         #self.assertEqual(p.exitcode, -signal.SIGTERM)
 
-    @unittest.skipIf(WIN32, 'Unix only')
-    def test_sigterm(self):
-        # A test for the Gentoo build bot which does not directly use
-        # multiprocessing.  Start and terminate child processes.
-        if self.TYPE != 'processes':
-            return
-        for i in range(10):
-            pid = os.fork()
-            if pid == 0:
-                try:
-                    print('sleeping', file=sys.stderr)
-                    time.sleep(100)
-                    print('waking', file=sys.stderr)
-                finally:
-                    sys.stderr.flush()
-                    os._exit(0)
-            else:
-                os.kill(pid, signal.SIGTERM)
-                def handler(*args):
-                    raise RuntimeError('waitpid() took too long')
-                old_handler = signal.signal(signal.SIGALRM, handler)
-                try:
-                    signal.alarm(10)
-                    pid_status = os.waitpid(pid, 0)
-                    self.assertEqual(pid_status[0], pid)
-                except RuntimeError:
-                    print('os.waitpid() =',
-                          os.waitpid(pid, os.WNOHANG), file=sys.stderr)
-                    raise
-                finally:
-                    signal.alarm(0)
-                    signal.signal(signal.SIGALRM, old_handler)
-
     def test_cpu_count(self):
         try:
             cpus = multiprocessing.cpu_count()