From 6641b3245fb67d86c3c88030cb63b42ffcdc8e9f Mon Sep 17 00:00:00 2001 From: Valentin Lorentz Date: Wed, 11 Aug 2021 20:06:27 +0200 Subject: [PATCH] Split user_commands.py by command For consistency with channel commands. --- irctest/server_tests/away.py | 27 +++++++ irctest/server_tests/messages.py | 36 +++++++++ .../{user_commands.py => whois.py} | 74 +------------------ 3 files changed, 64 insertions(+), 73 deletions(-) create mode 100644 irctest/server_tests/away.py rename irctest/server_tests/{user_commands.py => whois.py} (66%) diff --git a/irctest/server_tests/away.py b/irctest/server_tests/away.py new file mode 100644 index 0000000..4abde7a --- /dev/null +++ b/irctest/server_tests/away.py @@ -0,0 +1,27 @@ +from irctest import cases +from irctest.numerics import RPL_AWAY, RPL_NOWAWAY, RPL_UNAWAY + + +class AwayTestCase(cases.BaseServerTestCase): + @cases.mark_specifications("RFC2812") + def testAway(self): + self.connectClient("bar") + self.sendLine(1, "AWAY :I'm not here right now") + replies = self.getMessages(1) + self.assertIn(RPL_NOWAWAY, [msg.command for msg in replies]) + + self.connectClient("qux") + self.sendLine(2, "PRIVMSG bar :what's up") + self.assertMessageMatch( + self.getMessage(2), + command=RPL_AWAY, + params=["qux", "bar", "I'm not here right now"], + ) + + self.sendLine(1, "AWAY") + replies = self.getMessages(1) + self.assertIn(RPL_UNAWAY, [msg.command for msg in replies]) + + self.sendLine(2, "PRIVMSG bar :what's up") + replies = self.getMessages(2) + self.assertEqual(len(replies), 0) diff --git a/irctest/server_tests/messages.py b/irctest/server_tests/messages.py index d4721a4..f2cf90e 100644 --- a/irctest/server_tests/messages.py +++ b/irctest/server_tests/messages.py @@ -114,3 +114,39 @@ class LengthLimitTestCase(cases.BaseServerTestCase): self.assertMessageMatch(result, command=ERR_INPUTTOOLONG) # we should not be disconnected and should be able to join a channel self.joinChannel("bar", "#test_channel") + + +class TestNoCTCPMode(cases.BaseServerTestCase): + @cases.mark_specifications("Ergo") + def testNoCTCPMode(self): + self.connectClient("bar", "bar") + self.connectClient("qux", "qux") + # CTCP is not blocked by default: + self.sendLine("qux", "PRIVMSG bar :\x01VERSION\x01") + self.getMessages("qux") + relay = [msg for msg in self.getMessages("bar") if msg.command == "PRIVMSG"][0] + self.assertMessageMatch( + relay, command="PRIVMSG", params=["bar", "\x01VERSION\x01"] + ) + + # set the no-CTCP user mode on bar: + self.sendLine("bar", "MODE bar +T") + replies = self.getMessages("bar") + umode_line = [msg for msg in replies if msg.command == "MODE"][0] + self.assertMessageMatch(umode_line, command="MODE", params=["bar", "+T"]) + + # CTCP is now blocked: + self.sendLine("qux", "PRIVMSG bar :\x01VERSION\x01") + self.getMessages("qux") + self.assertEqual(self.getMessages("bar"), []) + + # normal PRIVMSG go through: + self.sendLine("qux", "PRIVMSG bar :please just tell me your client version") + self.getMessages("qux") + relay = self.getMessages("bar")[0] + self.assertMessageMatch( + relay, + command="PRIVMSG", + nick="qux", + params=["bar", "please just tell me your client version"], + ) diff --git a/irctest/server_tests/user_commands.py b/irctest/server_tests/whois.py similarity index 66% rename from irctest/server_tests/user_commands.py rename to irctest/server_tests/whois.py index 068c9c0..caed495 100644 --- a/irctest/server_tests/user_commands.py +++ b/irctest/server_tests/whois.py @@ -1,16 +1,5 @@ -""" -User commands as specified in Section 3.6 of RFC 2812: - -""" - from irctest import cases -from irctest.numerics import ( - RPL_AWAY, - RPL_NOWAWAY, - RPL_UNAWAY, - RPL_WHOISCHANNELS, - RPL_WHOISUSER, -) +from irctest.numerics import RPL_WHOISCHANNELS, RPL_WHOISUSER @cases.mark_services @@ -142,64 +131,3 @@ class WhoisTestCase(cases.BaseServerTestCase, cases.OptionalityHelper): messages = self.getMessages(2) whoisaccount = [message for message in messages if message.command == "330"] self.assertEqual(len(whoisaccount), 0) - - -class AwayTestCase(cases.BaseServerTestCase): - @cases.mark_specifications("RFC2812") - def testAway(self): - self.connectClient("bar") - self.sendLine(1, "AWAY :I'm not here right now") - replies = self.getMessages(1) - self.assertIn(RPL_NOWAWAY, [msg.command for msg in replies]) - - self.connectClient("qux") - self.sendLine(2, "PRIVMSG bar :what's up") - self.assertMessageMatch( - self.getMessage(2), - command=RPL_AWAY, - params=["qux", "bar", "I'm not here right now"], - ) - - self.sendLine(1, "AWAY") - replies = self.getMessages(1) - self.assertIn(RPL_UNAWAY, [msg.command for msg in replies]) - - self.sendLine(2, "PRIVMSG bar :what's up") - replies = self.getMessages(2) - self.assertEqual(len(replies), 0) - - -class TestNoCTCPMode(cases.BaseServerTestCase): - @cases.mark_specifications("Ergo") - def testNoCTCPMode(self): - self.connectClient("bar", "bar") - self.connectClient("qux", "qux") - # CTCP is not blocked by default: - self.sendLine("qux", "PRIVMSG bar :\x01VERSION\x01") - self.getMessages("qux") - relay = [msg for msg in self.getMessages("bar") if msg.command == "PRIVMSG"][0] - self.assertMessageMatch( - relay, command="PRIVMSG", params=["bar", "\x01VERSION\x01"] - ) - - # set the no-CTCP user mode on bar: - self.sendLine("bar", "MODE bar +T") - replies = self.getMessages("bar") - umode_line = [msg for msg in replies if msg.command == "MODE"][0] - self.assertMessageMatch(umode_line, command="MODE", params=["bar", "+T"]) - - # CTCP is now blocked: - self.sendLine("qux", "PRIVMSG bar :\x01VERSION\x01") - self.getMessages("qux") - self.assertEqual(self.getMessages("bar"), []) - - # normal PRIVMSG go through: - self.sendLine("qux", "PRIVMSG bar :please just tell me your client version") - self.getMessages("qux") - relay = self.getMessages("bar")[0] - self.assertMessageMatch( - relay, - command="PRIVMSG", - nick="qux", - params=["bar", "please just tell me your client version"], - )