Add test the bot won't account-extban itself

plugins/Channel/test.py

@@ -189,6 +189,30 @@ def testIban(self):
         self.assertBan('iban $a:nyuszika7h', '$a:nyuszika7h')
         self.assertNotError('unban $a:nyuszika7h')
 
+    def testWontIbanItself(self):
+        self.irc.state.supported['ACCOUNTEXTBAN'] = 'a,account'
+        self.irc.state.supported['EXTBAN'] = '~,abc'
+
+        self.irc.feedMsg(ircmsgs.join(self.channel,
+                                      prefix='[email protected]'))
+        self.irc.feedMsg(ircmsgs.op(self.channel, self.irc.nick))
+
+        # not authenticated, falls back to hostname and notices the match
+        self.assertError('iban --account ' + self.nick)
+
+        self.irc.feedMsg(ircmsgs.IrcMsg(prefix=self.prefix, command='ACCOUNT',
+                                        args=['botaccount']))
+
+        # notices the matching account
+        self.assertError('iban --account ' + self.nick)
+
+        self.irc.feedMsg(ircmsgs.IrcMsg(prefix='othernick!otheruser@otherhost',
+                                        command='ACCOUNT',
+                                        args=['botaccount']))
+
+        # ditto
+        self.assertError('iban --account othernick')
+
     def testKban(self):
         self.irc.prefix = '[email protected]'
         self.irc.nick = 'something'

src/test.py

@@ -318,7 +318,8 @@ def assertError(self, query, **kwargs):
             raise TimeoutError(query)
         if lastGetHelp not in m.args[1]:
             self.assertTrue(m.args[1].startswith('Error:'),
-                            '%r did not error: %s' % (query, m.args[1]))
+                            '%r did not error: %s' %
+                            (query, ' '.join(m.args[1:])))
         return m
 
     def assertSnarfError(self, query, **kwargs):