traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Issue #11393: Fix faulthandler.disable() and add a test

This commit is contained in:
Victor Stinner 2011-04-01 12:56:17 +02:00
parent d727e23243
commit a01ca12a52
2 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Lib/test/test_faulthandler.py
View File

@ -431,13 +431,15 @@ if file is not None:
@unittest.skipIf(not hasattr(faulthandler, "register"),
"need faulthandler.register")
def check_register(self, filename=False, all_threads=False):
def check_register(self, filename=False, all_threads=False,
unregister=False):
"""
Register a handler displaying the traceback on a user signal. Raise the
signal and check the written traceback.
Raise an error if the output doesn't match the expected format.
"""
signum = signal.SIGUSR1
code = """
import faulthandler
import os
@ -446,12 +448,15 @@ import signal
def func(signum):
os.kill(os.getpid(), signum)
signum = signal.SIGUSR1
signum = {signum}
unregister = {unregister}
if {has_filename}:
file = open({filename}, "wb")
else:
file = None
faulthandler.register(signum, file=file, all_threads={all_threads})
if unregister:
faulthandler.unregister(signum)
func(signum)
if file is not None:
file.close()
@ -460,20 +465,31 @@ if file is not None:
filename=repr(filename),
has_filename=bool(filename),
all_threads=all_threads,
signum=signum,
unregister=unregister,
)
trace, exitcode = self.get_output(code, filename)
trace = '\n'.join(trace)
if all_threads:
regex = 'Current thread XXX:\n'
if not unregister:
if all_threads:
regex = 'Current thread XXX:\n'
else:
regex = 'Traceback \(most recent call first\):\n'
regex = expected_traceback(6, 17, regex)
self.assertRegex(trace, regex)
else:
regex = 'Traceback \(most recent call first\):\n'
regex = expected_traceback(6, 14, regex)
self.assertRegex(trace, regex)
self.assertEqual(exitcode, 0)
self.assertEqual(trace, '')
if unregister:
self.assertNotEqual(exitcode, 0)
else:
self.assertEqual(exitcode, 0)
def test_register(self):
self.check_register()
def test_unregister(self):
self.check_register(unregister=True)
def test_register_file(self):
with temporary_filename() as filename:
self.check_register(filename=filename)

8
Modules/faulthandler.c
View File

@ -628,7 +628,7 @@ faulthandler_register(PyObject *self,
static int
faulthandler_unregister(user_signal_t *user, int signum)
{
if (user->enabled)
if (!user->enabled)
return 0;
user->enabled = 0;
#ifdef HAVE_SIGACTION
@ -976,7 +976,7 @@ int _PyFaulthandler_Init(void)
void _PyFaulthandler_Fini(void)
{
#ifdef FAULTHANDLER_USER
unsigned int i;
unsigned int signum;
#endif
#ifdef FAULTHANDLER_LATER
@ -995,8 +995,8 @@ void _PyFaulthandler_Fini(void)
#ifdef FAULTHANDLER_USER
/* user */
if (user_signals != NULL) {
for (i=0; i < NSIG; i++)
faulthandler_unregister(&user_signals[i], i+1);
for (signum=0; signum < NSIG; signum++)
faulthandler_unregister(&user_signals[signum], signum);
free(user_signals);
user_signals = NULL;
}