summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbendikro <bro.devel+deluge@gmail.com>2020-04-01 15:00:17 +0200
committerCalum Lind <calumlind+deluge@gmail.com>2020-04-23 17:19:37 +0100
commitc1110e4ef3e5402a397138977c28e33155908d34 (patch)
tree36803a00ed16583794cfe70d1160f760a70ef990
parent742c8a941af6691a6e48b167a70d15fdd5546924 (diff)
downloaddeluge-c1110e4ef3e5402a397138977c28e33155908d34.zip
deluge-c1110e4ef3e5402a397138977c28e33155908d34.tar.gz
deluge-c1110e4ef3e5402a397138977c28e33155908d34.tar.bz2
[Tests] Fix tests failing when deluged fails to listen
Commit b32c5d824 changed the logged message in deluge/core/daemon_entry.py when libtorrent fails to listen on the given port, without updating the trigger expression in deluge/tests/common.py:start_core to match the new output. Fix by updating the trigger match expressions to match the new log output
-rw-r--r--deluge/tests/common.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/deluge/tests/common.py b/deluge/tests/common.py
index e92cc0f..f0ddb2b 100644
--- a/deluge/tests/common.py
+++ b/deluge/tests/common.py
@@ -268,8 +268,8 @@ except Exception:
default_core_cb['triggers'] = [
{'expr': 'Finished loading ', 'value': lambda reader, data, data_all: reader},
{
- 'expr': 'Could not listen on localhost:%d' % (listen_port),
- 'type': 'errback', # Error from libtorrent
+ 'expr': 'Cannot start deluged, listen port in use.',
+ 'type': 'errback',
'value': lambda reader, data, data_all: CannotListenError(
'localhost',
listen_port,