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

INVITE: Fix misunderstanding of the RFCs (#148)

Browse Source 
They make the first argument of numerics implicit, so there is actually
no difference with Modern
This commit is contained in:
Val Lorentz
2022-03-31 15:53:51 +02:00
committed by GitHub
parent f52f21897b
commit 9a19416731
2 changed files with 41 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile
View File

@ -49,10 +49,10 @@ ERGO_SELECTORS := \
and not testInfoNosuchserver \ and not testInfoNosuchserver \
$(EXTRA_SELECTORS) $(EXTRA_SELECTORS)
# testInviteUnoppedModern is the only strict test that Hybrid fails # testInviteUnopped is the only strict test that Hybrid fails
HYBRID_SELECTORS := \ HYBRID_SELECTORS := \
not Ergo \ not Ergo \
and not testInviteUnoppedModern \ and not testInviteUnopped \
and not deprecated \ and not deprecated \
$(EXTRA_SELECTORS) $(EXTRA_SELECTORS)
@ -138,12 +138,12 @@ NGIRCD_SELECTORS := \
and (not HelpTestCase or HELPOP) \ and (not HelpTestCase or HELPOP) \
$(EXTRA_SELECTORS) $(EXTRA_SELECTORS)
# testInviteUnoppedModern is the only strict test that Plexus4 fails # testInviteUnopped is the only strict test that Plexus4 fails
# testInviteInviteOnlyModern fails because Plexus4 allows non-op to invite if (and only if) the channel is not invite-only # testInviteInviteOnly fails because Plexus4 allows non-op to invite if (and only if) the channel is not invite-only
PLEXUS4_SELECTORS := \ PLEXUS4_SELECTORS := \
not Ergo \ not Ergo \
and not testInviteUnoppedModern \ and not testInviteUnopped \
and not testInviteInviteOnlyModern \ and not testInviteInviteOnly \
and not deprecated \ and not deprecated \
$(EXTRA_SELECTORS) $(EXTRA_SELECTORS)

125
irctest/server_tests/invite.py
View File

@ -110,7 +110,7 @@ class InviteTestCase(cases.BaseServerTestCase):
"got this instead: {msg}", "got this instead: {msg}",
) )
def _testInvite(self, opped, invite_only, modern): def _testInvite(self, opped, invite_only):
""" """
"Only the user inviting and the user being invited will receive "Only the user inviting and the user being invited will receive
notification of the invitation." notification of the invitation."
@ -163,23 +163,14 @@ class InviteTestCase(cases.BaseServerTestCase):
) )
self.sendLine(1, "INVITE bar #chan") self.sendLine(1, "INVITE bar #chan")
if modern: self.assertMessageMatch(
self.assertMessageMatch( self.getMessage(1),
self.getMessage(1), command=RPL_INVITING,
command=RPL_INVITING, params=["foo", "bar", "#chan"],
params=["foo", "bar", "#chan"], fail_msg=f"After “foo” invited “bar” to a channel, “foo” should have "
fail_msg=f"After “foo” invited “bar” to a channel, “foo” should have " f"received “{RPL_INVITING} foo #chan bar” but got this instead: "
f"received “{RPL_INVITING} foo #chan bar” but got this instead: " f"{{msg}}",
f"{{msg}}", )
)
else:
self.assertMessageMatch(
self.getMessage(1),
command=RPL_INVITING,
params=["#chan", "bar"],
fail_msg=f"After “foo” invited “bar” to a channel, “foo” should have "
f"received “{RPL_INVITING} #chan bar” but got this instead: {{msg}}",
)
messages = self.getMessages(2) messages = self.getMessages(2)
self.assertNotEqual( self.assertNotEqual(
@ -197,24 +188,14 @@ class InviteTestCase(cases.BaseServerTestCase):
) )
@pytest.mark.parametrize("invite_only", [True, False]) @pytest.mark.parametrize("invite_only", [True, False])
@cases.mark_specifications("Modern") @cases.mark_specifications("RFC1459", "RFC2812", "Modern")
def testInviteModern(self, invite_only): def testInvite(self, invite_only):
self._testInvite(opped=True, invite_only=invite_only, modern=True) self._testInvite(opped=True, invite_only=invite_only)
@pytest.mark.parametrize("invite_only", [True, False]) @cases.mark_specifications("RFC1459", "RFC2812", "Modern", strict=True)
@cases.mark_specifications("RFC1459", "RFC2812", deprecated=True) def testInviteUnopped(self):
def testInviteRfc(self, invite_only):
self._testInvite(opped=True, invite_only=invite_only, modern=False)
@cases.mark_specifications("Modern", strict=True)
def testInviteUnoppedModern(self):
"""Tests invites from unopped users on not-invite-only chans.""" """Tests invites from unopped users on not-invite-only chans."""
self._testInvite(opped=False, invite_only=False, modern=True) self._testInvite(opped=False, invite_only=False)
@cases.mark_specifications("RFC1459", "RFC2812", deprecated=True, strict=True)
def testInviteUnoppedRfc(self, opped, invite_only):
"""Tests invites from unopped users on not-invite-only chans."""
self._testInvite(opped=False, invite_only=False, modern=False)
@cases.mark_specifications("RFC2812", "Modern") @cases.mark_specifications("RFC2812", "Modern")
def testInviteNoNotificationForOtherMembers(self): def testInviteNoNotificationForOtherMembers(self):
@ -248,7 +229,8 @@ class InviteTestCase(cases.BaseServerTestCase):
"were notified: {got}", "were notified: {got}",
) )
def _testInviteInviteOnly(self, modern): @cases.mark_specifications("RFC1459", "RFC2812", "Modern")
def testInviteInviteOnly(self):
""" """
"To invite a user to a channel which is invite only (MODE "To invite a user to a channel which is invite only (MODE
+i), the client sending the invite must be recognised as being a +i), the client sending the invite must be recognised as being a
@ -288,35 +270,17 @@ class InviteTestCase(cases.BaseServerTestCase):
) )
self.sendLine(1, "INVITE bar #chan") self.sendLine(1, "INVITE bar #chan")
if modern: self.assertMessageMatch(
self.assertMessageMatch( self.getMessage(1),
self.getMessage(1), command=ERR_CHANOPRIVSNEEDED,
command=ERR_CHANOPRIVSNEEDED, params=["foo", "#chan", ANYSTR],
params=["foo", "#chan", ANYSTR], fail_msg=f"After “foo” invited “bar” to a channel to an invite-only "
fail_msg=f"After “foo” invited “bar” to a channel to an invite-only " f"channel without being opped, “foo” should have received "
f"channel without being opped, “foo” should have received " f"“{ERR_CHANOPRIVSNEEDED} foo #chan :*” but got this instead: {{msg}}",
f"“{ERR_CHANOPRIVSNEEDED} foo #chan :*” but got this instead: {{msg}}", )
)
else:
self.assertMessageMatch(
self.getMessage(1),
command=ERR_CHANOPRIVSNEEDED,
params=["#chan", ANYSTR],
fail_msg=f"After “foo” invited “bar” to a channel to an invite-only "
f"channel without being opped, “foo” should have received "
f"“{ERR_CHANOPRIVSNEEDED} #chan :*” but got this instead: {{msg}}",
)
@cases.mark_specifications("Modern")
def testInviteInviteOnlyModern(self):
self._testInviteInviteOnly(modern=True)
@cases.mark_specifications("RFC1459", "RFC2812", deprecated=True)
def testInviteInviteOnlyRfc(self):
self._testInviteInviteOnly(modern=False)
@cases.mark_specifications("RFC2812", "Modern") @cases.mark_specifications("RFC2812", "Modern")
def _testInviteOnlyFromUsersInChannel(self, modern): def testInviteOnlyFromUsersInChannel(self):
""" """
"if the channel exists, only members of the channel are allowed "if the channel exists, only members of the channel are allowed
to invite other users" to invite other users"
@ -349,26 +313,15 @@ class InviteTestCase(cases.BaseServerTestCase):
self.getMessages(3) self.getMessages(3)
self.sendLine(1, "INVITE bar #chan") self.sendLine(1, "INVITE bar #chan")
if modern: self.assertMessageMatch(
self.assertMessageMatch( self.getMessage(1),
self.getMessage(1), command=ERR_NOTONCHANNEL,
command=ERR_NOTONCHANNEL, params=["foo", "#chan", ANYSTR],
params=["foo", "#chan", ANYSTR], fail_msg=f"After “foo” invited “bar” to a channel it is not on "
fail_msg=f"After “foo” invited “bar” to a channel it is not on " f"#chan, “foo” should have received "
f"#chan, “foo” should have received " f"“ERR_NOTONCHANNEL ({ERR_NOTONCHANNEL}) foo #chan :*” but "
f"“ERR_NOTONCHANNEL ({ERR_NOTONCHANNEL}) foo #chan :*” but " f"got this instead: {{msg}}",
f"got this instead: {{msg}}", )
)
else:
self.assertMessageMatch(
self.getMessage(1),
command=ERR_NOTONCHANNEL,
params=["#chan", ANYSTR],
fail_msg=f"After “foo” invited “bar” to a channel it is not on "
f"#chan, “foo” should have received "
f"“ERR_NOTONCHANNEL ({ERR_NOTONCHANNEL}) #chan :*” but "
f"got this instead: {{msg}}",
)
messages = self.getMessages(2) messages = self.getMessages(2)
self.assertEqual( self.assertEqual(
@ -378,14 +331,6 @@ class InviteTestCase(cases.BaseServerTestCase):
"not in #chan, “bar” received something.", "not in #chan, “bar” received something.",
) )
@cases.mark_specifications("Modern")
def testInviteOnlyFromUsersInChannelModern(self):
self._testInviteOnlyFromUsersInChannel(modern=True)
@cases.mark_specifications("RFC2812", deprecated=True)
def testInviteOnlyFromUsersInChannelRfc(self):
self._testInviteOnlyFromUsersInChannel(modern=False)
@cases.mark_specifications("Modern") @cases.mark_specifications("Modern")
def testInviteAlreadyInChannel(self): def testInviteAlreadyInChannel(self):
""" """