val/irctest
1
0
Fork 0
mirror of https://github.com/progval/irctest.git synced 2025-04-06 15:29:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix message matching on empty prefix/params/tags/...

Browse Source
This commit is contained in:
Valentin Lorentz
2021-12-11 13:01:31 +01:00
parent 6b1084face
commit d34175d6a8
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
irctest/cases.py
View File

@ -162,7 +162,7 @@ class _IrcTestCase(Generic[TController]):
msg=msg, msg=msg,
) )
if prefix and not patma.match_string(msg.prefix, prefix): if prefix is not None and not patma.match_string(msg.prefix, prefix):
fail_msg = ( fail_msg = (
fail_msg or "expected prefix to match {expects}, got {got}: {msg}" fail_msg or "expected prefix to match {expects}, got {got}: {msg}"
) )
@ -170,7 +170,7 @@ class _IrcTestCase(Generic[TController]):
*extra_format, got=msg.prefix, expects=prefix, msg=msg *extra_format, got=msg.prefix, expects=prefix, msg=msg
) )
if params and not patma.match_list(list(msg.params), params): if params is not None and not patma.match_list(list(msg.params), params):
fail_msg = ( fail_msg = (
fail_msg or "expected params to match {expects}, got {got}: {msg}" fail_msg or "expected params to match {expects}, got {got}: {msg}"
) )
@ -178,11 +178,11 @@ class _IrcTestCase(Generic[TController]):
*extra_format, got=msg.params, expects=params, msg=msg *extra_format, got=msg.params, expects=params, msg=msg
) )
if tags and not patma.match_dict(msg.tags, tags): if tags is not None and not patma.match_dict(msg.tags, tags):
fail_msg = fail_msg or "expected tags to match {expects}, got {got}: {msg}" fail_msg = fail_msg or "expected tags to match {expects}, got {got}: {msg}"
return fail_msg.format(*extra_format, got=msg.tags, expects=tags, msg=msg) return fail_msg.format(*extra_format, got=msg.tags, expects=tags, msg=msg)
if nick: if nick is not None:
got_nick = msg.prefix.split("!")[0] if msg.prefix else None got_nick = msg.prefix.split("!")[0] if msg.prefix else None
if nick != got_nick: if nick != got_nick:
fail_msg = ( fail_msg = (