3
0
mirror of https://github.com/jlu5/PyLink.git synced 2024-11-01 01:09:22 +01:00

Fix test cases

- conf: add sidrange server config variable (needed by TS6SIDGenerator)
- protocols: stop hardcoding various UIDs that may or may not exist.
This commit is contained in:
James Lu 2015-09-12 22:34:55 -07:00
parent dab29cfc19
commit dfaa5036ab
2 changed files with 12 additions and 11 deletions

View File

@ -27,7 +27,8 @@ testconf = {'bot':
'hostname': "pylink.unittest", 'hostname': "pylink.unittest",
'sid': "9PY", 'sid': "9PY",
'channels': ["#pylink"], 'channels': ["#pylink"],
'maxnicklen': 20 'maxnicklen': 20,
'sidrange': '8##'
}) })
} }
if world.testing: if world.testing:

View File

@ -174,8 +174,8 @@ class InspIRCdTestCase(tests_common.CommonProtoTestCase):
hookdata = self.irc.takeHooks() hookdata = self.irc.takeHooks()
expected = [['70M', 'FJOIN', {'channel': '#pylink', 'ts': 123, 'modes': [('+n', None)], expected = [['70M', 'FJOIN', {'channel': '#pylink', 'ts': 123, 'modes': [('+n', None)],
'users': ['10XAAAAAA', '10XAAAAAB']}], 'users': ['10XAAAAAA', '10XAAAAAB']}],
['70M', 'FMODE', {'target': '#pylink', 'modes': [('+l', '50'), ('+o', '9PYAAAAAA'), ('+t', None)], 'ts': 123}], ['70M', 'FMODE', {'target': '#pylink', 'modes': [('+l', '50'), ('+o', self.u), ('+t', None)], 'ts': 123}],
['70M', 'FMODE', {'target': '#pylink', 'modes': [('-o', '9PYAAAAAA')], 'ts': 123}]] ['70M', 'FMODE', {'target': '#pylink', 'modes': [('-o', self.u)], 'ts': 123}]]
self.assertEqual(expected, hookdata) self.assertEqual(expected, hookdata)
def testHandleFModeRemovesOldParams(self): def testHandleFModeRemovesOldParams(self):
@ -238,24 +238,24 @@ class InspIRCdTestCase(tests_common.CommonProtoTestCase):
self.assertIn('00C', self.irc.servers) self.assertIn('00C', self.irc.servers)
def testHandleNick(self): def testHandleNick(self):
self.irc.run(':9PYAAAAAA NICK PyLink-devel 1434744242') self.irc.run(':%s NICK PyLink-devel 1434744242' % self.u)
hookdata = self.irc.takeHooks()[0][-1] hookdata = self.irc.takeHooks()[0][-1]
expected = {'newnick': 'PyLink-devel', 'oldnick': 'PyLink', 'ts': 1434744242} expected = {'newnick': 'PyLink-devel', 'oldnick': 'PyLink', 'ts': 1434744242}
self.assertEqual(hookdata, expected) self.assertEqual(hookdata, expected)
self.assertEqual('PyLink-devel', self.irc.users['9PYAAAAAA'].nick) self.assertEqual('PyLink-devel', self.irc.users[self.u].nick)
def testHandleSave(self): def testHandleSave(self):
self.irc.run(':9PYAAAAAA NICK Derp_ 1433728673') self.irc.run(':%s NICK Derp_ 1433728673' % self.u)
self.irc.run(':70M SAVE 9PYAAAAAA 1433728673') self.irc.run(':70M SAVE %s 1433728673' % self.u)
hookdata = self.irc.takeHooks()[-1][-1] hookdata = self.irc.takeHooks()[-1][-1]
self.assertEqual(hookdata, {'target': '9PYAAAAAA', 'ts': 1433728673, 'oldnick': 'Derp_'}) self.assertEqual(hookdata, {'target': self.u, 'ts': 1433728673, 'oldnick': 'Derp_'})
self.assertEqual('9PYAAAAAA', self.irc.users['9PYAAAAAA'].nick) self.assertEqual(self.u, self.irc.users[self.u].nick)
def testHandleInvite(self): def testHandleInvite(self):
self.irc.run(':10XAAAAAA INVITE 9PYAAAAAA #blah 0') self.irc.run(':10XAAAAAA INVITE %s #blah 0' % self.u)
hookdata = self.irc.takeHooks()[-1][-1] hookdata = self.irc.takeHooks()[-1][-1]
del hookdata['ts'] del hookdata['ts']
self.assertEqual(hookdata, {'target': '9PYAAAAAA', 'channel': '#blah'}) self.assertEqual(hookdata, {'target': self.u, 'channel': '#blah'})
def testHandleOpertype(self): def testHandleOpertype(self):
self.irc.run('SERVER whatever. abcd 0 10X :Whatever Server - Hellas Planitia, Mars') self.irc.run('SERVER whatever. abcd 0 10X :Whatever Server - Hellas Planitia, Mars')