From: Victor Stinner <victor.stinner@gmail.com>
Date: Tue, 27 Jun 2017 13:37:19 +0000 (+0200)
Subject: bpo-30705: Fix test_regrtest.test_crashed() (#2439)
X-Git-Tag: v2.7.14rc1~75
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2d775589d98959abb9833121bd9d417003de56c0;p=python

bpo-30705: Fix test_regrtest.test_crashed() (#2439)

* Add test.support._crash_python() which triggers a crash but uses
  test.support.SuppressCrashReport() to prevent a crash report from
  popping up.
* Modify test_child_terminated_in_stopped_state() of test_subprocess
  and test_crashed() of test_regrtest to use _crash_python().
---

diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py
index 3b9eb045ff..d14f611df4 100644
--- a/Lib/test/support/__init__.py
+++ b/Lib/test/support/__init__.py
@@ -1945,3 +1945,17 @@ class SuppressCrashReport:
                 resource.setrlimit(resource.RLIMIT_CORE, self.old_value)
             except (ValueError, OSError):
                 pass
+
+
+def _crash_python():
+    """Deliberate crash of Python.
+
+    Python can be killed by a segmentation fault (SIGSEGV), a bus error
+    (SIGBUS), or a different error depending on the platform.
+
+    Use SuppressCrashReport() to prevent a crash report from popping up.
+    """
+
+    import ctypes
+    with SuppressCrashReport():
+        ctypes.string_at(0)
diff --git a/Lib/test/test_regrtest.py b/Lib/test/test_regrtest.py
index af9b1d5924..727f8d93cc 100644
--- a/Lib/test/test_regrtest.py
+++ b/Lib/test/test_regrtest.py
@@ -473,7 +473,7 @@ class ArgsTestCase(BaseTestCase):
 
     def test_crashed(self):
         # Any code which causes a crash
-        code = 'import ctypes; ctypes.string_at(0)'
+        code = 'import test.support; test.support._crash_python()'
         crash_test = self.create_test(name="crash", code=code)
         ok_test = self.create_test(name="ok")
 
diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py
index e0eb6f2a81..77633376eb 100644
--- a/Lib/test/test_subprocess.py
+++ b/Lib/test/test_subprocess.py
@@ -1277,7 +1277,7 @@ class POSIXProcessTestCase(BaseTestCase):
 
         code = textwrap.dedent("""
              import ctypes
-             from test.support import SuppressCrashReport
+             from test.support import _crash_python
 
              libc = ctypes.CDLL({libc_name!r})
              libc.ptrace({PTRACE_TRACEME}, 0, 0)
@@ -1288,9 +1288,8 @@ class POSIXProcessTestCase(BaseTestCase):
             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.
+             # Crash the process
+             _crash_python()
         """)
         child = subprocess.Popen([sys.executable, '-c', code])
         try: