Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2024-11-26 20:59:27 +01:00
Code Issues Projects Releases Wiki Activity

src/commands: Update first so that state.errored will not prevent the bot from responding when the first converter fails.

Browse Source
This commit is contained in:
James Vega 2005-06-13 17:27:15 +00:00
parent 35065b8fc5
commit e4c9381f7b
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/commands.py
View File

@ -757,15 +757,19 @@ class first(context):
self.specs = map(contextify, specs) self.specs = map(contextify, specs)
def __call__(self, irc, msg, args, state): def __call__(self, irc, msg, args, state):
errored = False
for spec in self.specs: for spec in self.specs:
try: try:
spec(irc, msg, args, state) spec(irc, msg, args, state)
return return
except Exception, e: except Exception, e:
errored = state.errored
state.errored = False
continue continue
if hasattr(self, 'default'): if hasattr(self, 'default'):
state.args.append(self.default) state.args.append(self.default)
else: else:
state.errored = errored
raise e raise e
class reverse(context): class reverse(context):

18
test/test_commands.py
View File

@ -51,6 +51,18 @@ class CommandsTestCase(SupyTestCase):
self.assertRaises(callbacks.Error, self.assertRaises(callbacks.Error,
self.assertState, spec, given, given) self.assertState, spec, given, given)
def assertStateErrored(self, spec, given, target='test', errored=True,
**kwargs):
msg = ircmsgs.privmsg(target, 'foo')
realIrc = getTestIrc()
realIrc.nick = 'test'
realIrc.state.supported['chantypes'] = '#'
irc = callbacks.SimpleProxy(realIrc, msg)
myspec = Spec(spec, **kwargs)
state = myspec(irc, msg, given)
self.assertEqual(state.errored, errored,
'Expected %r, got %r' % (errored, state.errored))
class GeneralContextTestCase(CommandsTestCase): class GeneralContextTestCase(CommandsTestCase):
def testEmptySpec(self): def testEmptySpec(self):
@ -135,7 +147,7 @@ class GeneralContextTestCase(CommandsTestCase):
self.assertState(spec, ['bar'], ['bar']) self.assertState(spec, ['bar'], ['bar'])
self.assertState(spec, ['baz'], ['baz']) self.assertState(spec, ['baz'], ['baz'])
self.assertError(spec, ['ba']) self.assertError(spec, ['ba'])
class ConverterTestCase(CommandsTestCase): class ConverterTestCase(CommandsTestCase):
def testUrlAllowsHttps(self): def testUrlAllowsHttps(self):
url = 'https://foo.bar/baz' url = 'https://foo.bar/baz'
@ -153,5 +165,9 @@ class FirstTestCase(CommandsTestCase):
def testRepr(self): def testRepr(self):
self.failUnless(repr(first('int'))) self.failUnless(repr(first('int')))
def testFirstConverterFailsAndNotErroredState(self):
self.assertStateErrored([first('int', 'something')], ['words'],
errored=False)
# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79: # vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79: