From 42accef2950d7f92cf9d6cbc323f1ff5c7682901 Mon Sep 17 00:00:00 2001 From: Calum Lind Date: Mon, 27 Nov 2023 15:27:34 +0000 Subject: [Tests] Fix unhandled ProcessTerminated trying to kill daemon in clean The GitHub CI tests on Linux were failing due to ProcessTerminated > await daemon.kill() E twisted.internet.error.ProcessTerminated: A process has ended with a probable error condition: process ended by signal 6. Added a try..except in daemon as a quick solution but might need to investigate the ProcessOutputHandler.kill method. --- deluge/conftest.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/deluge/conftest.py b/deluge/conftest.py index ca25cce8e..c3070140d 100644 --- a/deluge/conftest.py +++ b/deluge/conftest.py @@ -12,7 +12,7 @@ import pytest import pytest_twisted from twisted.internet import reactor from twisted.internet.defer import Deferred, maybeDeferred -from twisted.internet.error import CannotListenError +from twisted.internet.error import CannotListenError, ProcessTerminated from twisted.python.failure import Failure import deluge.component as _component @@ -120,7 +120,10 @@ async def daemon(request, config_dir, tmp_path): raise exception_error daemon.listen_port = listen_port yield daemon - await daemon.kill() + try: + await daemon.kill() + except ProcessTerminated: + pass @pytest.fixture(autouse=True) -- cgit v1.2.3