xfail for irc2 and workaround for ngIRCd

progval · Sep 3, 2023 · 1534579 · 1534579
1 parent 5f8d3be
commit 1534579
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 0 deletions.
diff --git a/irctest/server_tests/chmodes/key.py b/irctest/server_tests/chmodes/key.py
@@ -84,6 +84,8 @@ def testKeyValidation(self, key):
                 "ngIRCd does not validate channel keys: "
                 "https://github.com/ngircd/ngircd/issues/290"
             )
+        if key == " " and self.controller.software_name == "irc2":
+            pytest.xfail("irc2 rewrites non-empty keys that contain only spaces")
 
         self.connectClient("bar")
         self.joinChannel(1, "#chan")

diff --git a/irctest/server_tests/connection_registration.py b/irctest/server_tests/connection_registration.py
@@ -233,6 +233,7 @@ def testNonutf8Realname(self):
         else:
             self.assertTrue(False, "stuck waiting")
         self.sendLine(1, "WHOIS foo")
+        time.sleep(3)  # for ngIRCd
         d = self.clients[1].conn.recv(10000)
         print("S -> 1 (repr): " + repr(d))
         self.assertIn(b"username", d)

diff --git a/irctest/server_tests/messages.py b/irctest/server_tests/messages.py
@@ -54,6 +54,10 @@ def testPrivmsgNonexistentUser(self):
         self.assertMessageMatch(msg, command="401", params=["foo", "bar", ANYSTR])
 
     @cases.mark_specifications("RFC1459", "RFC2812", "Modern")
+    @cases.xfailIfSoftware(
+        ["irc2"],
+        "replies with ERR_NEEDMOREPARAMS instead of ERR_NOTEXTTOSEND",
+    )
     def testEmptyPrivmsg(self):
         self.connectClient("foo")
         self.sendLine(1, "JOIN #chan")