some test numerics were missing args

This commit is contained in:
jesopo 2020-09-29 11:44:45 +00:00
parent 07ed0bf13c
commit c841d1d6dd
9 changed files with 87 additions and 87 deletions

View File

@ -13,7 +13,7 @@ class CaseMapTestMethod(unittest.TestCase):
class CaseMapTestCommands(unittest.TestCase):
def test_join(self):
server = ircstates.Server("test")
server.parse_tokens(irctokens.tokenise("001 nickname"))
server.parse_tokens(irctokens.tokenise("001 nickname *"))
server.parse_tokens(irctokens.tokenise(":Nickname JOIN #Chan"))
server.parse_tokens(irctokens.tokenise(":Other JOIN #Chan"))
self.assertIn("nickname", server.users)
@ -28,7 +28,7 @@ class CaseMapTestCommands(unittest.TestCase):
def test_nick(self):
server = ircstates.Server("test")
server.parse_tokens(irctokens.tokenise("001 nickname"))
server.parse_tokens(irctokens.tokenise("001 nickname *"))
server.parse_tokens(irctokens.tokenise(":nickname JOIN #chan"))
user = server.users["nickname"]
server.parse_tokens(irctokens.tokenise(":nickname NICK NewNickname"))

View File

@ -5,7 +5,7 @@ import ircstates, irctokens
class ChannelTestJoin(unittest.TestCase):
def test_self_join(self):
server = ircstates.Server("test")
server.parse_tokens(irctokens.tokenise("001 nickname"))
server.parse_tokens(irctokens.tokenise("001 nickname *"))
server.parse_tokens(irctokens.tokenise(":nickname JOIN #chan"))
self.assertIn("#chan", server.channels)
self.assertIn("nickname", server.users)
@ -20,7 +20,7 @@ class ChannelTestJoin(unittest.TestCase):
def test_other_join(self):
server = ircstates.Server("test")
server.parse_tokens(irctokens.tokenise("001 nickname"))
server.parse_tokens(irctokens.tokenise("001 nickname *"))
server.parse_tokens(irctokens.tokenise(":nickname JOIN #chan"))
server.parse_tokens(irctokens.tokenise(":other JOIN #chan"))
self.assertEqual(len(server.users), 2)
@ -34,7 +34,7 @@ class ChannelTestJoin(unittest.TestCase):
class ChannelTestPart(unittest.TestCase):
def test_self_part(self):
server = ircstates.Server("test")
server.parse_tokens(irctokens.tokenise("001 nickname"))
server.parse_tokens(irctokens.tokenise("001 nickname *"))
server.parse_tokens(irctokens.tokenise(":nickname JOIN #chan"))
server.parse_tokens(irctokens.tokenise(":nickname PART #chan"))
self.assertEqual(len(server.users), 0)
@ -42,7 +42,7 @@ class ChannelTestPart(unittest.TestCase):
def test_other_part(self):
server = ircstates.Server("test")
server.parse_tokens(irctokens.tokenise("001 nickname"))
server.parse_tokens(irctokens.tokenise("001 nickname *"))
server.parse_tokens(irctokens.tokenise(":nickname JOIN #chan"))
server.parse_tokens(irctokens.tokenise(":other JOIN #chan"))
server.parse_tokens(irctokens.tokenise(":other PART #chan"))
@ -59,7 +59,7 @@ class ChannelTestPart(unittest.TestCase):
class ChannelTestKick(unittest.TestCase):
def test_self_kick(self):
server = ircstates.Server("test")
server.parse_tokens(irctokens.tokenise("001 nickname"))
server.parse_tokens(irctokens.tokenise("001 nickname *"))
server.parse_tokens(irctokens.tokenise(":nickname JOIN #chan"))
server.parse_tokens(
irctokens.tokenise(":nickname KICK #chan nickname"))
@ -68,7 +68,7 @@ class ChannelTestKick(unittest.TestCase):
def test_other_kick(self):
server = ircstates.Server("test")
server.parse_tokens(irctokens.tokenise("001 nickname"))
server.parse_tokens(irctokens.tokenise("001 nickname *"))
server.parse_tokens(irctokens.tokenise(":nickname JOIN #chan"))
server.parse_tokens(irctokens.tokenise(":other JOIN #chan"))
server.parse_tokens(irctokens.tokenise(":nickname KICK #chan other"))
@ -85,7 +85,7 @@ class ChannelTestKick(unittest.TestCase):
class ChannelTestTopic(unittest.TestCase):
def test_text(self):
server = ircstates.Server("test")
server.parse_tokens(irctokens.tokenise("001 nickname"))
server.parse_tokens(irctokens.tokenise("001 nickname *"))
server.parse_tokens(irctokens.tokenise(":nickname JOIN #chan"))
server.parse_tokens(irctokens.tokenise("332 * #chan :test"))
self.assertEqual(server.channels["#chan"].topic, "test")
@ -93,7 +93,7 @@ class ChannelTestTopic(unittest.TestCase):
def test_set_by_at(self):
dt = pendulum.datetime(2020, 3, 12, 14, 27, 57)
server = ircstates.Server("test")
server.parse_tokens(irctokens.tokenise("001 nickname"))
server.parse_tokens(irctokens.tokenise("001 nickname *"))
server.parse_tokens(irctokens.tokenise(":nickname JOIN #chan"))
server.parse_tokens(irctokens.tokenise("333 * #chan other 1584023277"))
channel = server.channels["#chan"]
@ -102,7 +102,7 @@ class ChannelTestTopic(unittest.TestCase):
def test_topic_command(self):
server = ircstates.Server("test")
server.parse_tokens(irctokens.tokenise("001 nickname"))
server.parse_tokens(irctokens.tokenise("001 nickname *"))
server.parse_tokens(irctokens.tokenise(":nickname JOIN #chan"))
server.parse_tokens(irctokens.tokenise("TOPIC #chan :hello there"))
self.assertEqual(server.channels["#chan"].topic, "hello there")
@ -111,7 +111,7 @@ class ChannelTestCreation(unittest.TestCase):
def test(self):
dt = pendulum.datetime(2020, 3, 12, 19, 38, 9)
server = ircstates.Server("test")
server.parse_tokens(irctokens.tokenise("001 nickname"))
server.parse_tokens(irctokens.tokenise("001 nickname *"))
server.parse_tokens(irctokens.tokenise(":nickname JOIN #chan"))
server.parse_tokens(irctokens.tokenise("329 * #chan 1584041889"))
self.assertEqual(server.channels["#chan"].created, dt)
@ -119,7 +119,7 @@ class ChannelTestCreation(unittest.TestCase):
class ChannelTestNAMES(unittest.TestCase):
def test(self):
server = ircstates.Server("test")
server.parse_tokens(irctokens.tokenise("001 nickname"))
server.parse_tokens(irctokens.tokenise("001 nickname *"))
server.parse_tokens(irctokens.tokenise(":nickname JOIN #chan"))
server.parse_tokens(irctokens.tokenise("353 * * #chan :nickname @+other"))
self.assertIn("nickname", server.users)
@ -138,7 +138,7 @@ class ChannelTestNAMES(unittest.TestCase):
def test_userhost_in_names(self):
server = ircstates.Server("test")
server.parse_tokens(irctokens.tokenise("001 nickname"))
server.parse_tokens(irctokens.tokenise("001 nickname *"))
server.parse_tokens(irctokens.tokenise(":nickname JOIN #chan"))
server.parse_tokens(irctokens.tokenise(
"353 * * #chan :nickname!user@host other!user2@host2"))
@ -151,7 +151,7 @@ class ChannelTestNAMES(unittest.TestCase):
class ChannelNICKAfterJoin(unittest.TestCase):
def test(self):
server = ircstates.Server("test")
server.parse_tokens(irctokens.tokenise("001 nickname"))
server.parse_tokens(irctokens.tokenise("001 nickname *"))
server.parse_tokens(irctokens.tokenise(":nickname JOIN #chan"))
user = server.users["nickname"]

View File

@ -4,7 +4,7 @@ import ircstates, irctokens
class EmitTest(unittest.TestCase):
def test_join(self):
server = ircstates.Server("test")
server.parse_tokens(irctokens.tokenise("001 nickname"))
server.parse_tokens(irctokens.tokenise("001 nickname *"))
emit = server.parse_tokens(
irctokens.tokenise(":nickname JOIN #chan"))
@ -23,7 +23,7 @@ class EmitTest(unittest.TestCase):
def test_privmsg(self):
server = ircstates.Server("test")
server.parse_tokens(irctokens.tokenise("001 nickname"))
server.parse_tokens(irctokens.tokenise("001 nickname *"))
server.parse_tokens(irctokens.tokenise(":nickname JOIN #chan"))
emit = server.parse_tokens(
irctokens.tokenise(":nickname PRIVMSG #chan :hello"))
@ -46,7 +46,7 @@ class EmitTest(unittest.TestCase):
def test_privmsg_nojoin(self):
server = ircstates.Server("test")
server.parse_tokens(irctokens.tokenise("001 nickname"))
server.parse_tokens(irctokens.tokenise("001 nickname *"))
server.parse_tokens(irctokens.tokenise(":nickname JOIN #chan"))
emit = server.parse_tokens(
@ -62,7 +62,7 @@ class EmitTest(unittest.TestCase):
def test_kick(self):
server = ircstates.Server("test")
server.parse_tokens(irctokens.tokenise("001 nickname"))
server.parse_tokens(irctokens.tokenise("001 nickname *"))
server.parse_tokens(irctokens.tokenise(":nickname JOIN #chan"))
user = server.users["nickname"]
channel = server.channels["#chan"]
@ -81,7 +81,7 @@ class EmitTest(unittest.TestCase):
def test_mode_self(self):
server = ircstates.Server("test")
server.parse_tokens(irctokens.tokenise("001 nickname"))
server.parse_tokens(irctokens.tokenise("001 nickname *"))
emit = server.parse_tokens(
irctokens.tokenise("MODE nickname x+i-i+wi-wi"))
@ -93,7 +93,7 @@ class EmitTest(unittest.TestCase):
def test_mode_channel(self):
server = ircstates.Server("test")
server.parse_tokens(irctokens.tokenise("001 nickname"))
server.parse_tokens(irctokens.tokenise("001 nickname *"))
server.parse_tokens(irctokens.tokenise(":nickname JOIN #chan"))
channel = server.channels["#chan"]
emit = server.parse_tokens(

View File

@ -4,7 +4,7 @@ import ircstates, irctokens
class ISUPPORTTest(unittest.TestCase):
def test_chanmodes(self):
server = ircstates.Server("test")
server.parse_tokens(irctokens.tokenise("001 nickname"))
server.parse_tokens(irctokens.tokenise("001 nickname *"))
self.assertEqual(server.isupport.chanmodes.a_modes, ["b"])
self.assertEqual(server.isupport.chanmodes.b_modes, ["k"])
self.assertEqual(server.isupport.chanmodes.c_modes, ["l"])
@ -18,7 +18,7 @@ class ISUPPORTTest(unittest.TestCase):
def test_prefix(self):
server = ircstates.Server("test")
server.parse_tokens(irctokens.tokenise("001 nickname"))
server.parse_tokens(irctokens.tokenise("001 nickname *"))
self.assertEqual(server.isupport.prefix.modes, ["o", "v"])
self.assertEqual(server.isupport.prefix.prefixes, ["@", "+"])
@ -38,14 +38,14 @@ class ISUPPORTTest(unittest.TestCase):
def test_chantypes(self):
server = ircstates.Server("test")
server.parse_tokens(irctokens.tokenise("001 nickname"))
server.parse_tokens(irctokens.tokenise("001 nickname *"))
self.assertEqual(server.isupport.chantypes, ["#"])
server.parse_tokens(irctokens.tokenise("005 * CHANTYPES=#& *"))
self.assertEqual(server.isupport.chantypes, ["#", "&"])
def test_modes(self):
server = ircstates.Server("test")
server.parse_tokens(irctokens.tokenise("001 nickname"))
server.parse_tokens(irctokens.tokenise("001 nickname *"))
self.assertEqual(server.isupport.modes, 3)
server.parse_tokens(irctokens.tokenise("005 * MODES *"))
self.assertEqual(server.isupport.modes, -1)
@ -54,40 +54,40 @@ class ISUPPORTTest(unittest.TestCase):
def test_rfc1459(self):
server = ircstates.Server("test")
server.parse_tokens(irctokens.tokenise("001 nickname"))
server.parse_tokens(irctokens.tokenise("001 nickname *"))
self.assertEqual(server.isupport.casemapping, "rfc1459")
server.parse_tokens(irctokens.tokenise("005 * CASEMAPPING=rfc1459 *"))
self.assertEqual(server.isupport.casemapping, "rfc1459")
def test_ascii(self):
server = ircstates.Server("test")
server.parse_tokens(irctokens.tokenise("001 nickname"))
server.parse_tokens(irctokens.tokenise("001 nickname *"))
server.parse_tokens(irctokens.tokenise("005 * CASEMAPPING=ascii *"))
self.assertEqual(server.isupport.casemapping, "ascii")
def test_fallback_to_rfc1459(self):
server = ircstates.Server("test")
server.parse_tokens(irctokens.tokenise("001 nickname"))
server.parse_tokens(irctokens.tokenise("001 nickname *"))
server.parse_tokens(irctokens.tokenise("005 * CASEMAPPING=asd *"))
self.assertEqual(server.isupport.casemapping, "rfc1459")
def test_network(self):
server = ircstates.Server("test")
server.parse_tokens(irctokens.tokenise("001 nickname"))
server.parse_tokens(irctokens.tokenise("001 nickname *"))
self.assertIsNone(server.isupport.network)
server.parse_tokens(irctokens.tokenise("005 * NETWORK=testnet *"))
self.assertEqual(server.isupport.network, "testnet")
def test_statusmsg(self):
server = ircstates.Server("test")
server.parse_tokens(irctokens.tokenise("001 nickname"))
server.parse_tokens(irctokens.tokenise("001 nickname *"))
self.assertEqual(server.isupport.statusmsg, [])
server.parse_tokens(irctokens.tokenise("005 * STATUSMSG=&@ *"))
self.assertEqual(server.isupport.statusmsg, ["&", "@"])
def test_callerid(self):
server = ircstates.Server("test")
server.parse_tokens(irctokens.tokenise("001 nickname"))
server.parse_tokens(irctokens.tokenise("001 nickname *"))
self.assertIsNone(server.isupport.callerid)
server.parse_tokens(irctokens.tokenise("005 * CALLERID=U *"))
self.assertEqual(server.isupport.callerid, "U")
@ -96,7 +96,7 @@ class ISUPPORTTest(unittest.TestCase):
def test_excepts(self):
server = ircstates.Server("test")
server.parse_tokens(irctokens.tokenise("001 nickname"))
server.parse_tokens(irctokens.tokenise("001 nickname *"))
self.assertIsNone(server.isupport.excepts)
server.parse_tokens(irctokens.tokenise("005 * EXCEPTS=U *"))
self.assertEqual(server.isupport.excepts, "U")
@ -105,7 +105,7 @@ class ISUPPORTTest(unittest.TestCase):
def test_invex(self):
server = ircstates.Server("test")
server.parse_tokens(irctokens.tokenise("001 nickname"))
server.parse_tokens(irctokens.tokenise("001 nickname *"))
self.assertIsNone(server.isupport.invex)
server.parse_tokens(irctokens.tokenise("005 * INVEX=U *"))
self.assertEqual(server.isupport.invex, "U")
@ -114,14 +114,14 @@ class ISUPPORTTest(unittest.TestCase):
def test_whox(self):
server = ircstates.Server("test")
server.parse_tokens(irctokens.tokenise("001 nickname"))
server.parse_tokens(irctokens.tokenise("001 nickname *"))
self.assertFalse(server.isupport.whox)
server.parse_tokens(irctokens.tokenise("005 * WHOX *"))
self.assertTrue(server.isupport.whox)
def test_monitor(self):
server = ircstates.Server("test")
server.parse_tokens(irctokens.tokenise("001 nickname"))
server.parse_tokens(irctokens.tokenise("001 nickname *"))
self.assertIsNone(server.isupport.monitor)
server.parse_tokens(irctokens.tokenise("005 * MONITOR=123 *"))
self.assertEqual(server.isupport.monitor, 123)
@ -130,7 +130,7 @@ class ISUPPORTTest(unittest.TestCase):
def test_watch(self):
server = ircstates.Server("test")
server.parse_tokens(irctokens.tokenise("001 nickname"))
server.parse_tokens(irctokens.tokenise("001 nickname *"))
self.assertIsNone(server.isupport.watch)
server.parse_tokens(irctokens.tokenise("005 * WATCH=123 *"))
self.assertEqual(server.isupport.watch, 123)

View File

@ -5,13 +5,13 @@ import ircstates, irctokens
class ModeTestUMode(unittest.TestCase):
def test_add(self):
server = ircstates.Server("test")
server.parse_tokens(irctokens.tokenise("001 nickname"))
server.parse_tokens(irctokens.tokenise("001 nickname *"))
server.parse_tokens(irctokens.tokenise("MODE nickname +i"))
self.assertEqual(server.modes, ["i"])
def test_remove(self):
server = ircstates.Server("test")
server.parse_tokens(irctokens.tokenise("001 nickname"))
server.parse_tokens(irctokens.tokenise("001 nickname *"))
server.parse_tokens(irctokens.tokenise("MODE nickname +i"))
server.parse_tokens(irctokens.tokenise("MODE nickname -i"))
self.assertEqual(server.modes, [])
@ -19,7 +19,7 @@ class ModeTestUMode(unittest.TestCase):
class ModeTestChannelPrefix(unittest.TestCase):
def test_add(self):
server = ircstates.Server("test")
server.parse_tokens(irctokens.tokenise("001 nickname"))
server.parse_tokens(irctokens.tokenise("001 nickname *"))
server.parse_tokens(irctokens.tokenise(":nickname JOIN #chan"))
server.parse_tokens(
irctokens.tokenise("MODE #chan +ov nickname nickname"))
@ -30,7 +30,7 @@ class ModeTestChannelPrefix(unittest.TestCase):
def test_remove(self):
server = ircstates.Server("test")
server.parse_tokens(irctokens.tokenise("001 nickname"))
server.parse_tokens(irctokens.tokenise("001 nickname *"))
server.parse_tokens(irctokens.tokenise(":nickname JOIN #chan"))
server.parse_tokens(
irctokens.tokenise("MODE #chan +ov nickname nickname"))
@ -44,7 +44,7 @@ class ModeTestChannelPrefix(unittest.TestCase):
class ModeTestChannelList(unittest.TestCase):
def test_add(self):
server = ircstates.Server("test")
server.parse_tokens(irctokens.tokenise("001 nickname"))
server.parse_tokens(irctokens.tokenise("001 nickname *"))
server.parse_tokens(irctokens.tokenise(":nickname JOIN #chan"))
server.parse_tokens(irctokens.tokenise("MODE #chan +b asd!*@*"))
channel = server.channels["#chan"]
@ -52,7 +52,7 @@ class ModeTestChannelList(unittest.TestCase):
def test_remove(self):
server = ircstates.Server("test")
server.parse_tokens(irctokens.tokenise("001 nickname"))
server.parse_tokens(irctokens.tokenise("001 nickname *"))
server.parse_tokens(irctokens.tokenise(":nickname JOIN #chan"))
server.parse_tokens(irctokens.tokenise("MODE #chan +b asd!*@*"))
server.parse_tokens(irctokens.tokenise("MODE #chan +b dsa!*@*"))
@ -62,7 +62,7 @@ class ModeTestChannelList(unittest.TestCase):
def test_banlist(self):
server = ircstates.Server("test")
server.parse_tokens(irctokens.tokenise("001 nickname"))
server.parse_tokens(irctokens.tokenise("001 nickname *"))
server.parse_tokens(irctokens.tokenise(":nickname JOIN #chan"))
server.parse_tokens(
irctokens.tokenise("367 * #chan *!*@host setby 1594477713"))
@ -70,7 +70,7 @@ class ModeTestChannelList(unittest.TestCase):
irctokens.tokenise("367 * #chan $a:account setby 1594477713"))
server.parse_tokens(
irctokens.tokenise("367 * #chan r:my*gecos"))
server.parse_tokens(irctokens.tokenise("368 * #chan"))
server.parse_tokens(irctokens.tokenise("368 * #chan *"))
channel = server.channels["#chan"]
self.assertEqual(
@ -80,7 +80,7 @@ class ModeTestChannelList(unittest.TestCase):
def test_quietlist(self):
server = ircstates.Server("test")
server.parse_tokens(irctokens.tokenise("001 nickname"))
server.parse_tokens(irctokens.tokenise("001 nickname *"))
server.parse_tokens(irctokens.tokenise(":nickname JOIN #chan"))
server.parse_tokens(
irctokens.tokenise("728 * #chan q q!*@host setby 1594477713"))
@ -88,7 +88,7 @@ class ModeTestChannelList(unittest.TestCase):
irctokens.tokenise("728 * #chan q $a:qaccount setby 1594477713"))
server.parse_tokens(
irctokens.tokenise("728 * #chan q r:q*my*gecos setby 1594477713"))
server.parse_tokens(irctokens.tokenise("729 * #chan q"))
server.parse_tokens(irctokens.tokenise("729 * #chan q *"))
channel = server.channels["#chan"]
self.assertEqual(
@ -100,7 +100,7 @@ class ModeTestChannelList(unittest.TestCase):
class ModeTestChannelTypeB(unittest.TestCase):
def test_add(self):
server = ircstates.Server("test")
server.parse_tokens(irctokens.tokenise("001 nickname"))
server.parse_tokens(irctokens.tokenise("001 nickname *"))
server.parse_tokens(irctokens.tokenise(":nickname JOIN #chan"))
server.parse_tokens(irctokens.tokenise("MODE #chan +k password"))
channel = server.channels["#chan"]
@ -108,7 +108,7 @@ class ModeTestChannelTypeB(unittest.TestCase):
def test_remove(self):
server = ircstates.Server("test")
server.parse_tokens(irctokens.tokenise("001 nickname"))
server.parse_tokens(irctokens.tokenise("001 nickname *"))
server.parse_tokens(irctokens.tokenise(":nickname JOIN #chan"))
server.parse_tokens(irctokens.tokenise("MODE #chan +k password"))
server.parse_tokens(irctokens.tokenise("MODE #chan -k *"))
@ -118,7 +118,7 @@ class ModeTestChannelTypeB(unittest.TestCase):
class ModeTestChannelTypeC(unittest.TestCase):
def test_add(self):
server = ircstates.Server("test")
server.parse_tokens(irctokens.tokenise("001 nickname"))
server.parse_tokens(irctokens.tokenise("001 nickname *"))
server.parse_tokens(irctokens.tokenise(":nickname JOIN #chan"))
server.parse_tokens(irctokens.tokenise("MODE #chan +l 100"))
channel = server.channels["#chan"]
@ -126,7 +126,7 @@ class ModeTestChannelTypeC(unittest.TestCase):
def test_remove(self):
server = ircstates.Server("test")
server.parse_tokens(irctokens.tokenise("001 nickname"))
server.parse_tokens(irctokens.tokenise("001 nickname *"))
server.parse_tokens(irctokens.tokenise(":nickname JOIN #chan"))
server.parse_tokens(irctokens.tokenise("MODE #chan +l 100"))
server.parse_tokens(irctokens.tokenise("MODE #chan -l"))
@ -136,7 +136,7 @@ class ModeTestChannelTypeC(unittest.TestCase):
class ModeTestChannelTypeD(unittest.TestCase):
def test_add(self):
server = ircstates.Server("test")
server.parse_tokens(irctokens.tokenise("001 nickname"))
server.parse_tokens(irctokens.tokenise("001 nickname *"))
server.parse_tokens(irctokens.tokenise(":nickname JOIN #chan"))
server.parse_tokens(irctokens.tokenise("MODE #chan +i"))
channel = server.channels["#chan"]
@ -144,7 +144,7 @@ class ModeTestChannelTypeD(unittest.TestCase):
def test_remove(self):
server = ircstates.Server("test")
server.parse_tokens(irctokens.tokenise("001 nickname"))
server.parse_tokens(irctokens.tokenise("001 nickname *"))
server.parse_tokens(irctokens.tokenise(":nickname JOIN #chan"))
server.parse_tokens(irctokens.tokenise("MODE #chan +i"))
server.parse_tokens(irctokens.tokenise("MODE #chan -i"))
@ -154,7 +154,7 @@ class ModeTestChannelTypeD(unittest.TestCase):
class ModeTestChannelNumeric(unittest.TestCase):
def test(self):
server = ircstates.Server("test")
server.parse_tokens(irctokens.tokenise("001 nickname"))
server.parse_tokens(irctokens.tokenise("001 nickname *"))
server.parse_tokens(irctokens.tokenise(":nickname JOIN #chan"))
server.parse_tokens(
irctokens.tokenise("324 * #chan +bkli *!*@* pass 10"))
@ -164,7 +164,7 @@ class ModeTestChannelNumeric(unittest.TestCase):
def test_without_plus(self):
server = ircstates.Server("test")
server.parse_tokens(irctokens.tokenise("001 nickname"))
server.parse_tokens(irctokens.tokenise("001 nickname *"))
server.parse_tokens(irctokens.tokenise(":nickname JOIN #chan"))
server.parse_tokens(irctokens.tokenise("324 * #chan il 10"))
channel = server.channels["#chan"]
@ -173,12 +173,12 @@ class ModeTestChannelNumeric(unittest.TestCase):
class ModeTestUserNumeric(unittest.TestCase):
def test(self):
server = ircstates.Server("test")
server.parse_tokens(irctokens.tokenise("001 nickname"))
server.parse_tokens(irctokens.tokenise("001 nickname *"))
server.parse_tokens(irctokens.tokenise("221 * +iw"))
self.assertEqual(server.modes, ["i", "w"])
def test_without_plus(self):
server = ircstates.Server("test")
server.parse_tokens(irctokens.tokenise("001 nickname"))
server.parse_tokens(irctokens.tokenise("001 nickname *"))
server.parse_tokens(irctokens.tokenise("221 * iw"))
self.assertEqual(server.modes, ["i", "w"])

View File

@ -4,7 +4,7 @@ import ircstates, irctokens
class MOTDTest(unittest.TestCase):
def test(self):
server = ircstates.Server("test")
server.parse_tokens(irctokens.tokenise("001 nickname"))
server.parse_tokens(irctokens.tokenise("001 nickname *"))
server.parse_tokens(irctokens.tokenise("375 * :start of motd"))
server.parse_tokens(irctokens.tokenise("372 * :first line of motd"))
server.parse_tokens(irctokens.tokenise("372 * :second line of motd"))

View File

@ -4,7 +4,7 @@ import ircstates, irctokens
class SASLTestAccount(unittest.TestCase):
def test_loggedin(self):
server = ircstates.Server("test")
server.parse_tokens(irctokens.tokenise("900 * nick!user@host account"))
server.parse_tokens(irctokens.tokenise("900 * nick!user@host account *"))
self.assertEqual(server.nickname, "nick")
self.assertEqual(server.username, "user")
@ -13,8 +13,8 @@ class SASLTestAccount(unittest.TestCase):
def test_loggedout(self):
server = ircstates.Server("test")
server.parse_tokens(irctokens.tokenise("900 * nick!user@host account"))
server.parse_tokens(irctokens.tokenise("901 * nick1!user1@host1"))
server.parse_tokens(irctokens.tokenise("900 * nick!user@host account *"))
server.parse_tokens(irctokens.tokenise("901 * nick1!user1@host1 *"))
self.assertEqual(server.nickname, "nick1")
self.assertEqual(server.username, "user1")

View File

@ -4,7 +4,7 @@ import ircstates, irctokens
class UserTestNicknameChange(unittest.TestCase):
def test(self):
server = ircstates.Server("test")
server.parse_tokens(irctokens.tokenise("001 nickname"))
server.parse_tokens(irctokens.tokenise("001 nickname *"))
server.parse_tokens(irctokens.tokenise(":nickname NICK Nickname2"))
self.assertEqual(server.nickname, "Nickname2")
self.assertEqual(server.nickname_lower, "nickname2")
@ -24,7 +24,7 @@ class UserTestNicknameChange(unittest.TestCase):
class UserTestHostmaskJoin(unittest.TestCase):
def test_both(self):
server = ircstates.Server("test")
server.parse_tokens(irctokens.tokenise("001 nickname"))
server.parse_tokens(irctokens.tokenise("001 nickname *"))
server.parse_tokens(
irctokens.tokenise(":nickname!user@host JOIN #chan"))
self.assertEqual(server.username, "user")
@ -39,7 +39,7 @@ class UserTestHostmaskJoin(unittest.TestCase):
def test_user(self):
server = ircstates.Server("test")
server.parse_tokens(irctokens.tokenise("001 nickname"))
server.parse_tokens(irctokens.tokenise("001 nickname *"))
server.parse_tokens(irctokens.tokenise(":nickname!user JOIN #chan"))
self.assertEqual(server.username, "user")
self.assertIsNone(server.hostname)
@ -53,7 +53,7 @@ class UserTestHostmaskJoin(unittest.TestCase):
def test_host(self):
server = ircstates.Server("test")
server.parse_tokens(irctokens.tokenise("001 nickname"))
server.parse_tokens(irctokens.tokenise("001 nickname *"))
server.parse_tokens(irctokens.tokenise(":nickname@host JOIN #chan"))
self.assertIsNone(server.username)
self.assertEqual(server.hostname, "host")
@ -68,7 +68,7 @@ class UserTestHostmaskJoin(unittest.TestCase):
class UserTestExtendedJoin(unittest.TestCase):
def test_without_extended_join(self):
server = ircstates.Server("test")
server.parse_tokens(irctokens.tokenise("001 nickname"))
server.parse_tokens(irctokens.tokenise("001 nickname *"))
server.parse_tokens(irctokens.tokenise(":nickname JOIN #chan"))
self.assertIsNone(server.account)
self.assertIsNone(server.realname)
@ -79,7 +79,7 @@ class UserTestExtendedJoin(unittest.TestCase):
def test_with_account(self):
server = ircstates.Server("test")
server.parse_tokens(irctokens.tokenise("001 nickname"))
server.parse_tokens(irctokens.tokenise("001 nickname *"))
server.parse_tokens(irctokens.tokenise(":nickname JOIN #chan acc :realname"))
self.assertEqual(server.account, "acc")
self.assertEqual(server.realname, "realname")
@ -90,7 +90,7 @@ class UserTestExtendedJoin(unittest.TestCase):
def test_without_account(self):
server = ircstates.Server("test")
server.parse_tokens(irctokens.tokenise("001 nickname"))
server.parse_tokens(irctokens.tokenise("001 nickname *"))
server.parse_tokens(irctokens.tokenise(":nickname JOIN #chan * :realname"))
self.assertEqual(server.account, "")
self.assertEqual(server.realname, "realname")
@ -102,7 +102,7 @@ class UserTestExtendedJoin(unittest.TestCase):
class UserTestAccountNotify(unittest.TestCase):
def test_with_account(self):
server = ircstates.Server("test")
server.parse_tokens(irctokens.tokenise("001 nickname"))
server.parse_tokens(irctokens.tokenise("001 nickname *"))
server.parse_tokens(irctokens.tokenise(":nickname JOIN #chan"))
server.parse_tokens(irctokens.tokenise(":nickname ACCOUNT acc"))
self.assertEqual(server.account, "acc")
@ -113,7 +113,7 @@ class UserTestAccountNotify(unittest.TestCase):
def test_without_account(self):
server = ircstates.Server("test")
server.parse_tokens(irctokens.tokenise("001 nickname"))
server.parse_tokens(irctokens.tokenise("001 nickname *"))
server.parse_tokens(irctokens.tokenise(":nickname JOIN #chan"))
server.parse_tokens(irctokens.tokenise(":nickname ACCOUNT *"))
self.assertEqual(server.account, "")
@ -125,7 +125,7 @@ class UserTestAccountNotify(unittest.TestCase):
class UserTestHostmaskPRIVMSG(unittest.TestCase):
def test_both(self):
server = ircstates.Server("test")
server.parse_tokens(irctokens.tokenise("001 nickname"))
server.parse_tokens(irctokens.tokenise("001 nickname *"))
server.parse_tokens(irctokens.tokenise(":nickname JOIN #chan"))
server.parse_tokens(
irctokens.tokenise(":nickname!user@host PRIVMSG #chan :hi"))
@ -140,7 +140,7 @@ class UserTestHostmaskPRIVMSG(unittest.TestCase):
def test_user(self):
server = ircstates.Server("test")
server.parse_tokens(irctokens.tokenise("001 nickname"))
server.parse_tokens(irctokens.tokenise("001 nickname *"))
server.parse_tokens(irctokens.tokenise(":nickname JOIN #chan"))
server.parse_tokens(
irctokens.tokenise(":nickname!user PRIVMSG #chan :hi"))
@ -155,7 +155,7 @@ class UserTestHostmaskPRIVMSG(unittest.TestCase):
def test_host(self):
server = ircstates.Server("test")
server.parse_tokens(irctokens.tokenise("001 nickname"))
server.parse_tokens(irctokens.tokenise("001 nickname *"))
server.parse_tokens(irctokens.tokenise(":nickname JOIN #chan"))
server.parse_tokens(
irctokens.tokenise(":nickname@host PRIVMSG #chan :hi"))
@ -171,22 +171,22 @@ class UserTestHostmaskPRIVMSG(unittest.TestCase):
class UserTestVisibleHost(unittest.TestCase):
def test_without_username(self):
server = ircstates.Server("test")
server.parse_tokens(irctokens.tokenise("001 nickname"))
server.parse_tokens(irctokens.tokenise("396 * hostname"))
server.parse_tokens(irctokens.tokenise("001 nickname *"))
server.parse_tokens(irctokens.tokenise("396 * hostname *"))
self.assertIsNone(server.username)
self.assertEqual(server.hostname, "hostname")
def test_with_username(self):
server = ircstates.Server("test")
server.parse_tokens(irctokens.tokenise("001 nickname"))
server.parse_tokens(irctokens.tokenise("396 * username@hostname"))
server.parse_tokens(irctokens.tokenise("001 nickname *"))
server.parse_tokens(irctokens.tokenise("396 * username@hostname *"))
self.assertEqual(server.username, "username")
self.assertEqual(server.hostname, "hostname")
class UserTestWHO(unittest.TestCase):
def test(self):
server = ircstates.Server("test")
server.parse_tokens(irctokens.tokenise("001 nickname"))
server.parse_tokens(irctokens.tokenise("001 nickname *"))
server.parse_tokens(irctokens.tokenise(":nickname JOIN #chan"))
server.parse_tokens(irctokens.tokenise(":other JOIN #chan"))
server.parse_tokens(
@ -205,7 +205,7 @@ class UserTestWHO(unittest.TestCase):
class UserTestCHGHOST(unittest.TestCase):
def test(self):
server = ircstates.Server("test")
server.parse_tokens(irctokens.tokenise("001 nickname"))
server.parse_tokens(irctokens.tokenise("001 nickname *"))
server.parse_tokens(
irctokens.tokenise(":nickname!user@host JOIN #chan"))
server.parse_tokens(irctokens.tokenise(":nickname CHGHOST u h"))
@ -221,7 +221,7 @@ class UserTestCHGHOST(unittest.TestCase):
class UserTestWHOIS(unittest.TestCase):
def test_user_line(self):
server = ircstates.Server("test")
server.parse_tokens(irctokens.tokenise("001 nickname"))
server.parse_tokens(irctokens.tokenise("001 nickname *"))
server.parse_tokens(irctokens.tokenise(":nickname JOIN #chan"))
server.parse_tokens(irctokens.tokenise("311 * nickname u h * :r"))
self.assertEqual(server.username, "u")
@ -238,7 +238,7 @@ class UserTestWHOIS(unittest.TestCase):
class UserTestAway(unittest.TestCase):
def test_verb_set(self):
server = ircstates.Server("test")
server.parse_tokens(irctokens.tokenise("001 nickname"))
server.parse_tokens(irctokens.tokenise("001 nickname *"))
server.parse_tokens(irctokens.tokenise(":nickname JOIN #chan"))
user = server.users["nickname"]
@ -251,7 +251,7 @@ class UserTestAway(unittest.TestCase):
def test_verb_unset(self):
server = ircstates.Server("test")
server.parse_tokens(irctokens.tokenise("001 nickname"))
server.parse_tokens(irctokens.tokenise("001 nickname *"))
server.parse_tokens(irctokens.tokenise(":nickname JOIN #chan"))
user = server.users["nickname"]
@ -263,7 +263,7 @@ class UserTestAway(unittest.TestCase):
def test_numeric(self):
server = ircstates.Server("test")
server.parse_tokens(irctokens.tokenise("001 nickname"))
server.parse_tokens(irctokens.tokenise("001 nickname *"))
server.parse_tokens(irctokens.tokenise(":nickname JOIN #chan"))
user = server.users["nickname"]
@ -278,7 +278,7 @@ class UserTestAway(unittest.TestCase):
class UserTestSETNAME(unittest.TestCase):
def test(self):
server = ircstates.Server("test")
server.parse_tokens(irctokens.tokenise("001 nickname"))
server.parse_tokens(irctokens.tokenise("001 nickname *"))
server.parse_tokens(irctokens.tokenise(":nickname JOIN #chan"))
server.parse_tokens(irctokens.tokenise(":other JOIN #chan"))
user = server.users["other"]

View File

@ -5,7 +5,7 @@ from ircstates.server import WHO_TYPE
class WHOTest(unittest.TestCase):
def test_who(self):
server = ircstates.Server("test")
server.parse_tokens(irctokens.tokenise("001 nickname"))
server.parse_tokens(irctokens.tokenise("001 nickname *"))
server.parse_tokens(irctokens.tokenise(":nickname JOIN #chan"))
user = server.users["nickname"]
server.parse_tokens(irctokens.tokenise(
@ -30,7 +30,7 @@ class WHOTest(unittest.TestCase):
def test_whox(self):
server = ircstates.Server("test")
server.parse_tokens(irctokens.tokenise("001 nickname"))
server.parse_tokens(irctokens.tokenise("001 nickname *"))
server.parse_tokens(irctokens.tokenise(":nickname JOIN #chan"))
user = server.users["nickname"]
server.parse_tokens(irctokens.tokenise(
@ -59,7 +59,7 @@ class WHOTest(unittest.TestCase):
def test_whox_no_account(self):
server = ircstates.Server("test")
server.parse_tokens(irctokens.tokenise("001 nickname"))
server.parse_tokens(irctokens.tokenise("001 nickname *"))
server.parse_tokens(irctokens.tokenise(":nickname JOIN #chan"))
user = server.users["nickname"]
@ -74,7 +74,7 @@ class WHOTest(unittest.TestCase):
def test_whox_ipv6(self):
server = ircstates.Server("test")
server.parse_tokens(irctokens.tokenise("001 nickname"))
server.parse_tokens(irctokens.tokenise("001 nickname *"))
server.parse_tokens(irctokens.tokenise(":nickname JOIN #chan"))
user = server.users["nickname"]