use longer nicknames again

Author: slingamn

irctest/server_tests/chmodes/operator.py

@@ -20,23 +20,23 @@ def testChannelOperatorMode(self):
         self.connectClient("chanop", name="chanop")
         self.joinChannel("chanop", "#chan")
 
-        self.connectClient("unprivd", name="unprivd")
-        self.joinChannel("unprivd", "#chan")
+        self.connectClient("unprivileged", name="unprivileged")
+        self.joinChannel("unprivileged", "#chan")
         self.getMessages("chanop")
 
-        self.connectClient("otherguy", name="otherguy")
-        self.joinChannel("otherguy", "#otherguy")
-        self.joinChannel("unprivd", "#otherguy")
-        self.getMessages("otherguy")
+        self.connectClient("unrelated", name="unrelated")
+        self.joinChannel("unrelated", "#unrelated")
+        self.joinChannel("unprivileged", "#unrelated")
+        self.getMessages("unrelated")
 
         # sender is a channel member but without the necessary privileges:
-        self.sendLine("unprivd", "MODE #chan +o unprivd")
-        messages = self.getMessages("unprivd")
+        self.sendLine("unprivileged", "MODE #chan +o unprivileged")
+        messages = self.getMessages("unprivileged")
         self.assertEqual(len(messages), 1)
         self.assertMessageMatch(messages[0], command=ERR_CHANOPRIVSNEEDED)
 
         # sender is a chanop, but target nick is not in the channel:
-        self.sendLine("chanop", "MODE #chan +o otherguy")
+        self.sendLine("chanop", "MODE #chan +o unrelated")
         messages = self.getMessages("chanop")
         self.assertEqual(len(messages), 1)
         self.assertMessageMatch(messages[0], command=ERR_USERNOTINCHANNEL)
@@ -66,30 +66,30 @@ def testChannelOperatorMode(self):
         )
 
         # sender is not a channel member, target nick exists but is not a channel member:
-        self.sendLine("chanop", "MODE #otherguy +o chanop")
+        self.sendLine("chanop", "MODE #unrelated +o chanop")
         messages = self.getMessages("chanop")
         self.assertEqual(len(messages), 1)
         self.assertIn(messages[0].command, [ERR_NOTONCHANNEL, ERR_CHANOPRIVSNEEDED])
 
         # sender is not a channel member, target nick exists and is a channel member:
-        self.sendLine("chanop", "MODE #otherguy +o unprivd")
+        self.sendLine("chanop", "MODE #unrelated +o unprivileged")
         messages = self.getMessages("chanop")
         self.assertEqual(len(messages), 1)
         self.assertIn(messages[0].command, [ERR_NOTONCHANNEL, ERR_CHANOPRIVSNEEDED])
 
         # test an actually successful mode grant:
-        self.sendLine("chanop", "MODE #chan +o unprivd")
+        self.sendLine("chanop", "MODE #chan +o unprivileged")
         messages = self.getMessages("chanop")
         self.assertEqual(len(messages), 1)
         self.assertMessageMatch(
             messages[0],
             command="MODE",
-            params=["#chan", "+o", "unprivd"],
+            params=["#chan", "+o", "unprivileged"],
         )
-        messages = self.getMessages("unprivd")
+        messages = self.getMessages("unprivileged")
         self.assertEqual(len(messages), 1)
         self.assertMessageMatch(
             messages[0],
             command="MODE",
-            params=["#chan", "+o", "unprivd"],
+            params=["#chan", "+o", "unprivileged"],
         )