From 22fcb91e8b9422f33ac48b54cff1d86e0070ae5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Helleu?= Date: Wed, 29 Nov 2023 18:14:37 +0100 Subject: irc: display messages 730/731 even if command `/notify` was not used (closes #2049) --- tests/unit/plugins/irc/test-irc-protocol.cpp | 57 ++++++++++++++++++++++++++-- 1 file changed, 54 insertions(+), 3 deletions(-) (limited to 'tests') diff --git a/tests/unit/plugins/irc/test-irc-protocol.cpp b/tests/unit/plugins/irc/test-irc-protocol.cpp index f394c0dab..7f3d3087f 100644 --- a/tests/unit/plugins/irc/test-irc-protocol.cpp +++ b/tests/unit/plugins/irc/test-irc-protocol.cpp @@ -6017,29 +6017,80 @@ TEST(IrcProtocolWithServer, 730) RECV(":server 731 alice"); CHECK_ERROR_PARAMS("731", 1, 2); + /* without notify */ RECV(":server 730 alice :nick1!user1@host1,nick2!user2@host2"); - CHECK_NO_MSG; + CHECK_SRV("--", "notify: nick1 (user1@host1) is connected", + "irc_notify,irc_notify_join,nick_nick1,notify_message,log3"); + CHECK_SRV("--", "notify: nick2 (user2@host2) is connected", + "irc_notify,irc_notify_join,nick_nick2,notify_message,log3"); + RECV(":server 730 alice :nick1!user1@host1,nick2!user2@host2"); + CHECK_SRV("--", "notify: nick1 (user1@host1) is connected", + "irc_notify,irc_notify_join,nick_nick1,notify_message,log3"); + CHECK_SRV("--", "notify: nick2 (user2@host2) is connected", + "irc_notify,irc_notify_join,nick_nick2,notify_message,log3"); RECV(":server 731 alice :nick1!user1@host1,nick2!user2@host2"); - CHECK_NO_MSG; + CHECK_SRV("--", "notify: nick1 (user1@host1) is offline", + "irc_notify,irc_notify_quit,nick_nick1,notify_message,log3"); + CHECK_SRV("--", "notify: nick2 (user2@host2) is offline", + "irc_notify,irc_notify_quit,nick_nick2,notify_message,log3"); + RECV(":server 731 alice :nick1!user1@host1,nick2!user2@host2"); + CHECK_SRV("--", "notify: nick1 (user1@host1) is offline", + "irc_notify,irc_notify_quit,nick_nick1,notify_message,log3"); + CHECK_SRV("--", "notify: nick2 (user2@host2) is offline", + "irc_notify,irc_notify_quit,nick_nick2,notify_message,log3"); /* with notify on nick1 */ run_cmd_quiet ("/notify add nick1 " IRC_FAKE_SERVER); + RECV(":server 730 alice :nick1!user1@host1,nick2!user2@host2"); CHECK_SRV("--", "notify: nick1 (user1@host1) is connected", "irc_notify,irc_notify_join,nick_nick1,notify_message,log3"); + CHECK_SRV("--", "notify: nick2 (user2@host2) is connected", + "irc_notify,irc_notify_join,nick_nick2,notify_message,log3"); + RECV(":server 730 alice :nick1!user1@host1,nick2!user2@host2"); + CHECK_SRV("--", "notify: nick2 (user2@host2) is connected", + "irc_notify,irc_notify_join,nick_nick2,notify_message,log3"); + RECV(":server 731 alice :nick1!user1@host1,nick2!user2@host2"); CHECK_SRV("--", "notify: nick1 (user1@host1) has quit", "irc_notify,irc_notify_quit,nick_nick1,notify_message,log3"); + CHECK_SRV("--", "notify: nick2 (user2@host2) is offline", + "irc_notify,irc_notify_quit,nick_nick2,notify_message,log3"); + RECV(":server 731 alice :nick1!user1@host1,nick2!user2@host2"); + CHECK_SRV("--", "notify: nick2 (user2@host2) is offline", + "irc_notify,irc_notify_quit,nick_nick2,notify_message,log3"); + + RECV(":server 730 alice :nick1!user1@host1,nick2!user2@host2"); + CHECK_SRV("--", "notify: nick1 (user1@host1) has connected", + "irc_notify,irc_notify_join,nick_nick1,notify_message,log3"); + CHECK_SRV("--", "notify: nick2 (user2@host2) is connected", + "irc_notify,irc_notify_join,nick_nick2,notify_message,log3"); + + run_cmd_quiet ("/mute /notify del nick1 " IRC_FAKE_SERVER); /* with notify on nick1 and nick2 */ + run_cmd_quiet ("/notify add nick1 " IRC_FAKE_SERVER); run_cmd_quiet ("/notify add nick2 " IRC_FAKE_SERVER); + RECV(":server 730 alice :nick1!user1@host1,nick2!user2@host2"); - CHECK_SRV("--", "notify: nick1 (user1@host1) has connected", + CHECK_SRV("--", "notify: nick1 (user1@host1) is connected", "irc_notify,irc_notify_join,nick_nick1,notify_message,log3"); CHECK_SRV("--", "notify: nick2 (user2@host2) is connected", "irc_notify,irc_notify_join,nick_nick2,notify_message,log3"); + RECV(":server 731 alice :nick1!user1@host1,nick2!user2@host2"); + CHECK_SRV("--", "notify: nick1 (user1@host1) has quit", + "irc_notify,irc_notify_quit,nick_nick1,notify_message,log3"); + CHECK_SRV("--", "notify: nick2 (user2@host2) has quit", + "irc_notify,irc_notify_quit,nick_nick2,notify_message,log3"); + + RECV(":server 730 alice :nick1!user1@host1,nick2!user2@host2"); + CHECK_SRV("--", "notify: nick1 (user1@host1) has connected", + "irc_notify,irc_notify_join,nick_nick1,notify_message,log3"); + CHECK_SRV("--", "notify: nick2 (user2@host2) has connected", + "irc_notify,irc_notify_join,nick_nick2,notify_message,log3"); + run_cmd_quiet ("/mute /notify del nick1 " IRC_FAKE_SERVER); run_cmd_quiet ("/mute /notify del nick2 " IRC_FAKE_SERVER); } -- cgit v1.2.3