https://github.com/python/cpython/commit/7435f053b4a54372a2c43dee7a15c4b973f09209
commit: 7435f053b4a54372a2c43dee7a15c4b973f09209
branch: main
author: Victor Stinner <[email protected]>
committer: vstinner <[email protected]>
date: 2024-07-02T10:34:13+02:00
summary:
Move get_signal_name() to test.support (#121251)
* Move get_signal_name() from test.libregrtest to test.support.
* Use get_signal_name() in support.script_helper.
* support.script_helper now decodes stdout and stderr from UTF-8,
instead of ASCII, if a command failed.
files:
M Lib/test/libregrtest/run_workers.py
M Lib/test/libregrtest/utils.py
M Lib/test/support/__init__.py
M Lib/test/support/script_helper.py
M Lib/test/test_regrtest.py
M Lib/test/test_support.py
diff --git a/Lib/test/libregrtest/run_workers.py
b/Lib/test/libregrtest/run_workers.py
index a71050e66db3bd..387ddf9614cf79 100644
--- a/Lib/test/libregrtest/run_workers.py
+++ b/Lib/test/libregrtest/run_workers.py
@@ -22,7 +22,7 @@
from .single import PROGRESS_MIN_TIME
from .utils import (
StrPath, TestName,
- format_duration, print_warning, count, plural, get_signal_name)
+ format_duration, print_warning, count, plural)
from .worker import create_worker_process, USE_PROCESS_GROUP
if MS_WINDOWS:
@@ -366,7 +366,7 @@ def _runtest(self, test_name: TestName) ->
MultiprocessResult:
err_msg=None,
state=State.TIMEOUT)
if retcode != 0:
- name = get_signal_name(retcode)
+ name = support.get_signal_name(retcode)
if name:
retcode = f"{retcode} ({name})"
raise WorkerError(self.test_name, f"Exit code {retcode}",
stdout,
diff --git a/Lib/test/libregrtest/utils.py b/Lib/test/libregrtest/utils.py
index 0167742d388a2c..0197e50125d96e 100644
--- a/Lib/test/libregrtest/utils.py
+++ b/Lib/test/libregrtest/utils.py
@@ -685,35 +685,6 @@ def cleanup_temp_dir(tmp_dir: StrPath):
print("Remove file: %s" % name)
os_helper.unlink(name)
-WINDOWS_STATUS = {
- 0xC0000005: "STATUS_ACCESS_VIOLATION",
- 0xC00000FD: "STATUS_STACK_OVERFLOW",
- 0xC000013A: "STATUS_CONTROL_C_EXIT",
-}
-
-def get_signal_name(exitcode):
- if exitcode < 0:
- signum = -exitcode
- try:
- return signal.Signals(signum).name
- except ValueError:
- pass
-
- # Shell exit code (ex: WASI build)
- if 128 < exitcode < 256:
- signum = exitcode - 128
- try:
- return signal.Signals(signum).name
- except ValueError:
- pass
-
- try:
- return WINDOWS_STATUS[exitcode]
- except KeyError:
- pass
-
- return None
-
ILLEGAL_XML_CHARS_RE = re.compile(
'['
diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py
index dbea070929be9b..18455bb6e0ff52 100644
--- a/Lib/test/support/__init__.py
+++ b/Lib/test/support/__init__.py
@@ -2632,3 +2632,35 @@ def initialized_with_pyrepl():
"""Detect whether PyREPL was used during Python initialization."""
# If the main module has a __file__ attribute it's a Python module, which
means PyREPL.
return hasattr(sys.modules["__main__"], "__file__")
+
+
+WINDOWS_STATUS = {
+ 0xC0000005: "STATUS_ACCESS_VIOLATION",
+ 0xC00000FD: "STATUS_STACK_OVERFLOW",
+ 0xC000013A: "STATUS_CONTROL_C_EXIT",
+}
+
+def get_signal_name(exitcode):
+ import signal
+
+ if exitcode < 0:
+ signum = -exitcode
+ try:
+ return signal.Signals(signum).name
+ except ValueError:
+ pass
+
+ # Shell exit code (ex: WASI build)
+ if 128 < exitcode < 256:
+ signum = exitcode - 128
+ try:
+ return signal.Signals(signum).name
+ except ValueError:
+ pass
+
+ try:
+ return WINDOWS_STATUS[exitcode]
+ except KeyError:
+ pass
+
+ return None
diff --git a/Lib/test/support/script_helper.py
b/Lib/test/support/script_helper.py
index 65e0bc199e7f0b..d0be3179b0efa3 100644
--- a/Lib/test/support/script_helper.py
+++ b/Lib/test/support/script_helper.py
@@ -70,23 +70,25 @@ def fail(self, cmd_line):
out = b'(... truncated stdout ...)' + out[-maxlen:]
if len(err) > maxlen:
err = b'(... truncated stderr ...)' + err[-maxlen:]
- out = out.decode('ascii', 'replace').rstrip()
- err = err.decode('ascii', 'replace').rstrip()
- raise AssertionError("Process return code is %d\n"
- "command line: %r\n"
- "\n"
- "stdout:\n"
- "---\n"
- "%s\n"
- "---\n"
- "\n"
- "stderr:\n"
- "---\n"
- "%s\n"
- "---"
- % (self.rc, cmd_line,
- out,
- err))
+ out = out.decode('utf8', 'replace').rstrip()
+ err = err.decode('utf8', 'replace').rstrip()
+
+ exitcode = self.rc
+ signame = support.get_signal_name(exitcode)
+ if signame:
+ exitcode = f"{exitcode} ({signame})"
+ raise AssertionError(f"Process return code is {exitcode}\n"
+ f"command line: {cmd_line!r}\n"
+ f"\n"
+ f"stdout:\n"
+ f"---\n"
+ f"{out}\n"
+ f"---\n"
+ f"\n"
+ f"stderr:\n"
+ f"---\n"
+ f"{err}\n"
+ f"---")
# Executing the interpreter in a subprocess
diff --git a/Lib/test/test_regrtest.py b/Lib/test/test_regrtest.py
index 44fd11bfdc3fcb..d4f4a69a7a38c1 100644
--- a/Lib/test/test_regrtest.py
+++ b/Lib/test/test_regrtest.py
@@ -2329,16 +2329,6 @@ def test_normalize_test_name(self):
self.assertIsNone(normalize('setUpModule (test.test_x)',
is_error=True))
self.assertIsNone(normalize('tearDownModule (test.test_module)',
is_error=True))
- def test_get_signal_name(self):
- for exitcode, expected in (
- (-int(signal.SIGINT), 'SIGINT'),
- (-int(signal.SIGSEGV), 'SIGSEGV'),
- (128 + int(signal.SIGABRT), 'SIGABRT'),
- (3221225477, "STATUS_ACCESS_VIOLATION"),
- (0xC00000FD, "STATUS_STACK_OVERFLOW"),
- ):
- self.assertEqual(utils.get_signal_name(exitcode), expected,
exitcode)
-
def test_format_resources(self):
format_resources = utils.format_resources
ALL_RESOURCES = utils.ALL_RESOURCES
diff --git a/Lib/test/test_support.py b/Lib/test/test_support.py
index d6f024a476920c..e60e5477d32e1f 100644
--- a/Lib/test/test_support.py
+++ b/Lib/test/test_support.py
@@ -3,6 +3,7 @@
import io
import os
import shutil
+import signal
import socket
import stat
import subprocess
@@ -732,6 +733,17 @@ def test_copy_python_src_ignore(self):
self.assertEqual(support.copy_python_src_ignore(path,
os.listdir(path)),
ignored)
+ def test_get_signal_name(self):
+ for exitcode, expected in (
+ (-int(signal.SIGINT), 'SIGINT'),
+ (-int(signal.SIGSEGV), 'SIGSEGV'),
+ (128 + int(signal.SIGABRT), 'SIGABRT'),
+ (3221225477, "STATUS_ACCESS_VIOLATION"),
+ (0xC00000FD, "STATUS_STACK_OVERFLOW"),
+ ):
+ self.assertEqual(support.get_signal_name(exitcode), expected,
+ exitcode)
+
# XXX -follows a list of untested API
# make_legacy_pyc
# is_resource_enabled
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]
