From cdee3f14f7f4c995e7eedb0bf6a67e260c739f7d Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Mon, 26 Jun 2017 17:23:03 +0200 Subject: bpo-30764: test_subprocess uses SuppressCrashReport (#2405) bpo-30764, bpo-29335: test_child_terminated_in_stopped_state() of test_subprocess now uses support.SuppressCrashReport() to prevent the creation of a core dump on FreeBSD. --- Lib/test/test_subprocess.py | 41 ++++++++++++++++++++++------------------- 1 file changed, 22 insertions(+), 19 deletions(-) diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py index 4c6e159..4052c5e 100644 --- a/Lib/test/test_subprocess.py +++ b/Lib/test/test_subprocess.py @@ -2563,37 +2563,40 @@ class POSIXProcessTestCase(BaseTestCase): proc.communicate(timeout=999) mock_proc_stdin.close.assert_called_once_with() - @unittest.skipIf(not ctypes, 'ctypes module required.') - @unittest.skipIf(not sys.executable, 'Test requires sys.executable.') + @unittest.skipIf(not ctypes, 'ctypes module required') + @unittest.skipIf(not sys.executable, 'Test requires sys.executable') def test_child_terminated_in_stopped_state(self): """Test wait() behavior when waitpid returns WIFSTOPPED; issue29335.""" PTRACE_TRACEME = 0 # From glibc and MacOS (PT_TRACE_ME). libc_name = ctypes.util.find_library('c') libc = ctypes.CDLL(libc_name) if not hasattr(libc, 'ptrace'): - raise unittest.SkipTest('ptrace() required.') - test_ptrace = subprocess.Popen( - [sys.executable, '-c', """if True: + raise unittest.SkipTest('ptrace() required') + + code = textwrap.dedent(f""" import ctypes + import faulthandler + from test.support import SuppressCrashReport + libc = ctypes.CDLL({libc_name!r}) libc.ptrace({PTRACE_TRACEME}, 0, 0) - """.format(libc_name=libc_name, PTRACE_TRACEME=PTRACE_TRACEME) - ]) - if test_ptrace.wait() != 0: - raise unittest.SkipTest('ptrace() failed - unable to test.') - child = subprocess.Popen( - [sys.executable, '-c', """if True: - import ctypes, faulthandler - libc = ctypes.CDLL({libc_name!r}) - libc.ptrace({PTRACE_TRACEME}, 0, 0) - faulthandler._sigsegv() # Crash the process. - """.format(libc_name=libc_name, PTRACE_TRACEME=PTRACE_TRACEME) - ]) + """) + + child = subprocess.Popen([sys.executable, '-c', code]) + if child.wait() != 0: + raise unittest.SkipTest('ptrace() failed - unable to test') + + code += textwrap.dedent(f""" + with SuppressCrashReport(): + # Crash the process + faulthandler._sigsegv() + """) + child = subprocess.Popen([sys.executable, '-c', code]) try: returncode = child.wait() - except Exception as e: + except: child.kill() # Clean up the hung stopped process. - raise e + raise self.assertNotEqual(0, returncode) self.assertLess(returncode, 0) # signal death, likely SIGSEGV. -- cgit v0.12