val
/
irctest
mirror of https://github.com/progval/irctest.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make testCapRemovalByClient not specific to Oragono

This commit is contained in:
Valentin Lorentz 2021-02-25 23:08:17 +01:00 committed by Valentin Lorentz
parent ff67739c67
commit e6ca463dce
1 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
irctest/server_tests/test_cap.py
View File

@ -1,7 +1,8 @@
from irctest import cases from irctest import cases
from irctest.runner import CapabilityNotSupported, ImplementationChoice
class CapTestCase(cases.BaseServerTestCase): class CapTestCase(cases.BaseServerTestCase, cases.OptionalityHelper):
@cases.mark_specifications("IRCv3.1") @cases.mark_specifications("IRCv3.1")
def testNoReq(self): def testNoReq(self):
"""Test the server handles gracefully clients which do not send """Test the server handles gracefully clients which do not send
@ -123,34 +124,48 @@ class CapTestCase(cases.BaseServerTestCase):
"sending “CAP REQ :multi-prefix”, but got {msg}.", "sending “CAP REQ :multi-prefix”, but got {msg}.",
) )
@cases.mark_specifications("Oragono") @cases.mark_specifications("IRCv3.1")
def testCapRemovalByClient(self): def testCapRemovalByClient(self):
"""Test CAP LIST and removal of caps via CAP REQ :-tagname.""" """Test CAP LIST and removal of caps via CAP REQ :-tagname."""
cap1 = "echo-message"
cap2 = "server-time"
self.addClient(1) self.addClient(1)
self.sendLine(1, "CAP LS 302") self.sendLine(1, "CAP LS 302")
self.assertIn("multi-prefix", self.getCapLs(1)) m = self.getMessage(1)
self.sendLine(1, "CAP REQ :echo-message server-time") if not ({cap1, cap2} <= set(m.params[2].split())):
raise CapabilityNotSupported(f"{cap1} or {cap2}")
self.sendLine(1, f"CAP REQ :{cap1} {cap2}")
self.sendLine(1, "nick bar") self.sendLine(1, "nick bar")
self.sendLine(1, "user user 0 * realname") self.sendLine(1, "user user 0 * realname")
self.sendLine(1, "CAP END") self.sendLine(1, "CAP END")
m = self.getRegistrationMessage(1)
self.assertMessageEqual(m, command="CAP", subcommand="ACK")
self.assertEqual(
set(m.params[2].split()), {cap1, cap2}, "Didn't ACK both REQed caps"
)
self.skipToWelcome(1) self.skipToWelcome(1)
self.getMessages(1)
self.sendLine(1, "CAP LIST") self.sendLine(1, "CAP LIST")
messages = self.getMessages(1) messages = self.getMessages(1)
cap_list = [m for m in messages if m.command == "CAP"][0] cap_list = [m for m in messages if m.command == "CAP"][0]
self.assertEqual( self.assertEqual(set(cap_list.params[2].split()), {cap1, cap2})
set(cap_list.params[2].split()), {"echo-message", "server-time"}
)
self.assertIn("time", cap_list.tags) self.assertIn("time", cap_list.tags)
# remove the server-time cap # remove the server-time cap
self.sendLine(1, "CAP REQ :-server-time") self.sendLine(1, f"CAP REQ :-{cap2}")
self.getMessages(1) m = self.getMessage(1)
# Must be either ACK or NAK
if self.messageDiffers(
m, command="CAP", subcommand="ACK", subparams=[f"-{cap2}"]
):
self.assertMessageEqual(
m, command="CAP", subcommand="NAK", subparams=[f"-{cap2}"]
)
raise ImplementationChoice(f"Does not support CAP REQ -{cap2}")
# server-time should be disabled # server-time should be disabled
self.sendLine(1, "CAP LIST") self.sendLine(1, "CAP LIST")
messages = self.getMessages(1) messages = self.getMessages(1)
cap_list = [m for m in messages if m.command == "CAP"][0] cap_list = [m for m in messages if m.command == "CAP"][0]
self.assertEqual(set(cap_list.params[2].split()), {"echo-message"}) self.assertEqual(set(cap_list.params[2].split()), {cap1})
self.assertNotIn("time", cap_list.tags) self.assertNotIn("time", cap_list.tags)