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

Generalize ANYSTR to ListRemainder

Browse Source 
So it can match specific strings and have a minimum length.
This can be used to match ISUPPORT-like messages.
This commit is contained in:
Valentin Lorentz
2021-12-11 13:02:47 +01:00
parent d34175d6a8
commit 79c65cf248
2 changed files with 79 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
irctest/patma.py
View File

@ -70,12 +70,19 @@ ANYDICT = {RemainingKeys(ANYSTR): AnyOptStr()}
`match_dict(got_tags, {"label": "foo", **ANYDICT})`""" `match_dict(got_tags, {"label": "foo", **ANYDICT})`"""
class _AnyListRemainder: @dataclasses.dataclass(frozen=True)
class ListRemainder:
item: Operator
min_length: int = 0
def __repr__(self) -> str: def __repr__(self) -> str:
return "*ANYLIST" if self.min_length:
return f"*ListRemainder({self.item!r}, min_length={self.min_length})"
else:
return f"*ListRemainder({self.item!r})"
ANYLIST = [_AnyListRemainder()] ANYLIST = [ListRemainder(ANYSTR)]
"""Matches any list remainder""" """Matches any list remainder"""
@ -109,9 +116,13 @@ def match_list(
The ANYSTR operator can be used on the 'expected' side as a wildcard, The ANYSTR operator can be used on the 'expected' side as a wildcard,
matching any *single* value; and StrRe("<regexp>") can be used to match regular matching any *single* value; and StrRe("<regexp>") can be used to match regular
expressions""" expressions"""
if expected[-1] is ANYLIST[0]: if expected and isinstance(expected[-1], ListRemainder):
expected = expected[0:-1] # Expand the 'expected' list to have as many items as the 'got' list
got = got[0 : len(expected)] # Ignore remaining expected = list(expected) # copy
remainder = expected.pop()
nb_remaining_items = len(got) - len(expected)
expected += [remainder.item] * max(nb_remaining_items, remainder.min_length)
if len(got) != len(expected): if len(got) != len(expected):
return False return False
return all( return all(

63
irctest/self_tests/cases.py
View File

@ -4,7 +4,16 @@ import pytest
from irctest import cases from irctest import cases
from irctest.irc_utils.message_parser import parse_message from irctest.irc_utils.message_parser import parse_message
from irctest.patma import ANYDICT, ANYSTR, AnyOptStr, NotStrRe, RemainingKeys, StrRe from irctest.patma import (
ANYDICT,
ANYLIST,
ANYSTR,
AnyOptStr,
ListRemainder,
NotStrRe,
RemainingKeys,
StrRe,
)
# fmt: off # fmt: off
MESSAGE_SPECS: List[Tuple[Dict, List[str], List[str]]] = [ MESSAGE_SPECS: List[Tuple[Dict, List[str], List[str]]] = [
@ -152,6 +161,58 @@ MESSAGE_SPECS: List[Tuple[Dict, List[str], List[str]]] = [
"@tag1=bar;tag2=baz PRIVMSG #chan :hello", "@tag1=bar;tag2=baz PRIVMSG #chan :hello",
] ]
), ),
(
# the specification:
dict(
command="005",
params=["nick", "FOO=1", *ANYLIST],
),
# matches:
[
"005 nick FOO=1",
"005 nick FOO=1 BAR=2",
],
# and does not match:
[
"005 nick",
"005 nick BAR=2",
]
),
(
# the specification:
dict(
command="005",
params=["nick", ListRemainder(ANYSTR, min_length=1)],
),
# matches:
[
"005 nick FOO=1",
"005 nick FOO=1 BAR=2",
"005 nick BAR=2",
],
# and does not match:
[
"005 nick",
]
),
(
# the specification:
dict(
command="005",
params=["nick", ListRemainder(StrRe("[A-Z]+=.*"), min_length=1)],
),
# matches:
[
"005 nick FOO=1",
"005 nick FOO=1 BAR=2",
"005 nick BAR=2",
],
# and does not match:
[
"005 nick",
"005 nick foo=1",
]
),
] ]
# fmt: on # fmt: on