[2.7] bpo-30764: test_subprocess uses SuppressCrashReport (#2405) (#2412)
* bpo-30764: Backport support.SuppressCrashReport
Backport test.support.SuppressCrashReport context-manager from
master. Drop the Windows implementation since it depends on
msvcrt.CrtSetReportMode() which isn't available on Python 2.7.
* 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.
(cherry picked from commit cdee3f14f7f4c995e7eedb0bf6a67e260c739f7d)
diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py
index 5220891..e0eb6f2 100644
--- a/Lib/test/test_subprocess.py
+++ b/Lib/test/test_subprocess.py
@@ -10,11 +10,14 @@
import time
import re
import sysconfig
+import textwrap
try:
import ctypes
except ImportError:
ctypes = None
+else:
+ import ctypes.util
try:
import resource
@@ -1262,43 +1265,39 @@
self.assertEqual(p2.returncode, 0, "Unexpected error: " + repr(stderr))
- _libc_file_extensions = {
- 'Linux': 'so.6',
- 'Darwin': 'dylib',
- }
- @unittest.skipIf(not ctypes, 'ctypes module required.')
- @unittest.skipIf(platform.uname()[0] not in _libc_file_extensions,
- 'Test requires a libc this code can load with ctypes.')
- @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 = 'libc.' + self._libc_file_extensions[platform.uname()[0]]
+ 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("""
import ctypes
+ 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
- libc = ctypes.CDLL({libc_name!r})
- libc.ptrace({PTRACE_TRACEME}, 0, 0)
- libc.printf(ctypes.c_char_p(0xdeadbeef)) # Crash the process.
- """.format(libc_name=libc_name, PTRACE_TRACEME=PTRACE_TRACEME)
- ])
+ """.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("""
+ with SuppressCrashReport():
+ # Crash the process
+ libc.printf(ctypes.c_char_p(0xdeadbeef)) # Crash the process.
+ """)
+ 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.