Fix test_faulthandler on Android where raise() exits with 0

This commit is contained in:
Xavier de Gaye 2016-11-13 20:46:46 +01:00
parent f056b04eea
commit 6c5f21945a
2 changed files with 23 additions and 3 deletions

View file

@ -7,7 +7,7 @@ import signal
import subprocess
import sys
from test import support
from test.support import script_helper
from test.support import script_helper, is_android, requires_android_level
import tempfile
import unittest
from textwrap import dedent
@ -42,6 +42,10 @@ def temporary_filename():
finally:
support.unlink(filename)
def requires_raise(test):
return (test if not is_android else
requires_android_level(24, 'raise() is buggy')(test))
class FaultHandlerTests(unittest.TestCase):
def get_output(self, code, filename=None, fd=None):
"""
@ -141,6 +145,7 @@ class FaultHandlerTests(unittest.TestCase):
3,
'access violation')
@requires_raise
def test_sigsegv(self):
self.check_fatal_error("""
import faulthandler
@ -183,6 +188,7 @@ class FaultHandlerTests(unittest.TestCase):
@unittest.skipIf(_testcapi is None, 'need _testcapi')
@unittest.skipUnless(hasattr(signal, 'SIGBUS'), 'need signal.SIGBUS')
@requires_raise
def test_sigbus(self):
self.check_fatal_error("""
import _testcapi
@ -197,6 +203,7 @@ class FaultHandlerTests(unittest.TestCase):
@unittest.skipIf(_testcapi is None, 'need _testcapi')
@unittest.skipUnless(hasattr(signal, 'SIGILL'), 'need signal.SIGILL')
@requires_raise
def test_sigill(self):
self.check_fatal_error("""
import _testcapi
@ -240,6 +247,7 @@ class FaultHandlerTests(unittest.TestCase):
'(?:Segmentation fault|Bus error)',
other_regex='unable to raise a stack overflow')
@requires_raise
def test_gil_released(self):
self.check_fatal_error("""
import faulthandler
@ -249,6 +257,7 @@ class FaultHandlerTests(unittest.TestCase):
3,
'Segmentation fault')
@requires_raise
def test_enable_file(self):
with temporary_filename() as filename:
self.check_fatal_error("""
@ -263,6 +272,7 @@ class FaultHandlerTests(unittest.TestCase):
@unittest.skipIf(sys.platform == "win32",
"subprocess doesn't support pass_fds on Windows")
@requires_raise
def test_enable_fd(self):
with tempfile.TemporaryFile('wb+') as fp:
fd = fp.fileno()
@ -276,6 +286,7 @@ class FaultHandlerTests(unittest.TestCase):
'Segmentation fault',
fd=fd)
@requires_raise
def test_enable_single_thread(self):
self.check_fatal_error("""
import faulthandler
@ -286,6 +297,7 @@ class FaultHandlerTests(unittest.TestCase):
'Segmentation fault',
all_threads=False)
@requires_raise
def test_disable(self):
code = """
import faulthandler