From edc6893d5dcce357a2da13b791dae274cc60cae7 Mon Sep 17 00:00:00 2001 From: Hendrik Makait Date: Tue, 17 May 2022 20:12:54 +0200 Subject: [PATCH] Code review feedback --- distributed/cli/tests/test_dask_scheduler.py | 2 +- distributed/cli/tests/test_dask_worker.py | 2 +- distributed/cli/utils.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/distributed/cli/tests/test_dask_scheduler.py b/distributed/cli/tests/test_dask_scheduler.py index 3ae417dbf71..1b01d1ad355 100644 --- a/distributed/cli/tests/test_dask_scheduler.py +++ b/distributed/cli/tests/test_dask_scheduler.py @@ -477,6 +477,6 @@ def test_signal_handling(loop, sig): logs = stdout.decode().lower() assert stderr is None assert scheduler.returncode == 0 - assert f"signal {sig}" in logs + assert sig.name.lower() in logs assert "scheduler closing" in logs assert "end scheduler" in logs diff --git a/distributed/cli/tests/test_dask_worker.py b/distributed/cli/tests/test_dask_worker.py index 0e11ce0839b..a6ba6d45aa6 100644 --- a/distributed/cli/tests/test_dask_worker.py +++ b/distributed/cli/tests/test_dask_worker.py @@ -725,7 +725,7 @@ async def test_signal_handling(c, s, nanny, sig): logs = stdout.decode().lower() assert stderr is None assert worker.returncode == 0 - assert f"signal {sig}" in logs + assert sig.name.lower() in logs if nanny == "--nanny": assert "closing nanny" in logs assert "stopping worker" in logs diff --git a/distributed/cli/utils.py b/distributed/cli/utils.py index 083065c52db..f25b7245c41 100644 --- a/distributed/cli/utils.py +++ b/distributed/cli/utils.py @@ -19,7 +19,7 @@ def handle_signal(signum, frame): # Restore old signal handler to allow for quicker exit # if the user sends the signal again. signal.signal(signum, old_handlers[signum]) - logger.info("Received signal %d", signum) + logger.info("Received signal %s (%d)", signal.Signals(signum).name, signum) loop.call_soon_threadsafe(event.set) for sig in signals: