mirrors/deluge
0
0
Fork 0
mirror of https://git.deluge-torrent.org/deluge synced 2025-08-12 19:28:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[Tests] Fix unhandled ProcessTerminated trying to kill daemon in clean

Browse source 
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.
This commit is contained in:
Calum Lind 2023-11-27 15:27:34 +00:00
commit 42accef295
No known key found for this signature in database
GPG key ID: 90597A687B836BA3
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
deluge/conftest.py
View file

@ -12,7 +12,7 @@ import pytest
import pytest_twisted import pytest_twisted
from twisted.internet import reactor from twisted.internet import reactor
from twisted.internet.defer import Deferred, maybeDeferred 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 from twisted.python.failure import Failure
import deluge.component as _component import deluge.component as _component
@ -120,7 +120,10 @@ async def daemon(request, config_dir, tmp_path):
raise exception_error raise exception_error
daemon.listen_port = listen_port daemon.listen_port = listen_port
yield daemon yield daemon
await daemon.kill() try:
await daemon.kill()
except ProcessTerminated:
pass
@pytest.fixture(autouse=True) @pytest.fixture(autouse=True)