Make AWAY and away-notify tests stricter

progval · Sep 3, 2023 · 44e828a · 44e828a
1 parent c58167b
commit 44e828a
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 11 deletions.
diff --git a/irctest/server_tests/away.py b/irctest/server_tests/away.py
@@ -11,13 +11,14 @@
     RPL_USERHOST,
     RPL_WHOISUSER,
 )
-from irctest.patma import StrRe
+from irctest.patma import ANYSTR, StrRe
 
 
 class AwayTestCase(cases.BaseServerTestCase):
     @cases.mark_specifications("RFC2812", "Modern")
     def testAway(self):
         self.connectClient("bar")
+        self.getMessages(1)
         self.sendLine(1, "AWAY :I'm not here right now")
         replies = self.getMessages(1)
         self.assertIn(RPL_NOWAWAY, [msg.command for msg in replies])
@@ -29,6 +30,7 @@ def testAway(self):
             command=RPL_AWAY,
             params=["qux", "bar", "I'm not here right now"],
         )
+        self.getMessages(1)
 
         self.sendLine(1, "AWAY")
         replies = self.getMessages(1)
@@ -47,12 +49,18 @@ def testAwayAck(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.assertMessageMatch(
+                self.getMessage(1),
+                command=RPL_NOWAWAY,
+                params=["bar", ANYSTR])
+        self.assertEqual(self.getMessages(1), [])
 
         self.sendLine(1, "AWAY")
-        replies = self.getMessages(1)
-        self.assertIn(RPL_UNAWAY, [msg.command for msg in replies])
+        self.assertMessageMatch(
+                self.getMessage(1),
+                command=RPL_UNAWAY,
+                params=["bar", ANYSTR])
+        self.assertEqual(self.getMessages(1), [])
 
     @cases.mark_specifications("Modern")
     def testAwayPrivmsg(self):

diff --git a/irctest/server_tests/away_notify.py b/irctest/server_tests/away_notify.py
@@ -3,6 +3,11 @@
 """
 
 from irctest import cases
+from irctest.patma import ANYSTR, StrRe
+from irctest.numerics import (
+    RPL_NOWAWAY,
+    RPL_UNAWAY,
+)
 
 
 class AwayNotifyTestCase(cases.BaseServerTestCase):
@@ -20,14 +25,24 @@ def testAwayNotify(self):
         self.getMessages(1)
 
         self.sendLine(2, "AWAY :i'm going away")
-        self.getMessages(2)
+        self.assertMessageMatch(
+                self.getMessage(2),
+                command=RPL_NOWAWAY,
+                params=["bar", ANYSTR])
+        self.assertEqual(self.getMessages(2), [])
 
         awayNotify = self.getMessage(1)
-        self.assertMessageMatch(awayNotify, command="AWAY", params=["i'm going away"])
-        self.assertTrue(
-            awayNotify.prefix.startswith("bar!"),
-            "Unexpected away-notify source: %s" % (awayNotify.prefix,),
-        )
+        self.assertMessageMatch(awayNotify, prefix=StrRe("bar!.*"), command="AWAY", params=["i'm going away"])
+
+        self.sendLine(2, "AWAY")
+        self.assertMessageMatch(
+                self.getMessage(2),
+                command=RPL_UNAWAY,
+                params=["bar", ANYSTR])
+        self.assertEqual(self.getMessages(2), [])
+
+        awayNotify = self.getMessage(1)
+        self.assertMessageMatch(awayNotify, prefix=StrRe("bar!.*"), command="AWAY", params=[])
 
     @cases.mark_capabilities("away-notify")
     def testAwayNotifyOnJoin(self):