Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2024-12-25 04:02:46 +01:00
Code Issues Projects Releases Wiki Activity

Fix merge.

Browse Source
This commit is contained in:
Valentin Lorentz 2015-05-15 14:43:57 +02:00
parent 487f8c8af5
commit 7031e47ebd
1 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
test/test_commands.py
View File

@ -197,24 +197,17 @@ class FirstTestCase(CommandsTestCase):
self.assertStateErrored([first('int', 'something')], ['words'], self.assertStateErrored([first('int', 'something')], ['words'],
errored=False) errored=False)
<<<<<<< HEAD
=======
def testLongRegexp(self): def testLongRegexp(self):
spec = [first('regexpMatcher', 'regexpReplacer'), 'text'] spec = [first('regexpMatcher', 'regexpReplacer'), 'text']
self.assertStateErrored(spec, ['s/foo/bar/', 'x' * 512], errored=False) self.assertStateErrored(spec, ['s/foo/bar/', 'x' * 512], errored=False)
>>>>>>> supybot/master
class GetoptTestCase(PluginTestCase): class GetoptTestCase(PluginTestCase):
plugins = ('Misc',) # We put something so it does not complain plugins = ('Misc',) # We put something so it does not complain
class Foo(callbacks.Plugin): class Foo(callbacks.Plugin):
def bar(self, irc, msg, args, optlist): def bar(self, irc, msg, args, optlist):
irc.reply(' '.join(sorted(['%s:%d'%x for x in optlist]))) irc.reply(' '.join(sorted(['%s:%d'%x for x in optlist])))
<<<<<<< HEAD
bar = wrap(bar, [getopts({'foo': 'int', 'fbar': 'int'})], bar = wrap(bar, [getopts({'foo': 'int', 'fbar': 'int'})],
checkDoc=False) checkDoc=False)
=======
bar = wrap(bar, [getopts({'foo': 'int', 'fbar': 'int'})])
>>>>>>> supybot/master
def testGetoptsExact(self): def testGetoptsExact(self):
self.irc.addCallback(self.Foo(self.irc)) self.irc.addCallback(self.Foo(self.irc))
@ -223,9 +216,5 @@ class GetoptTestCase(PluginTestCase):
self.assertResponse('bar --f 3 --fb 5', self.assertResponse('bar --f 3 --fb 5',
'Error: Invalid arguments for bar.') 'Error: Invalid arguments for bar.')
<<<<<<< HEAD
=======
>>>>>>> supybot/master
# vim:set shiftwidth=4 softtabstop=4 expandtab textwidth=79: # vim:set shiftwidth=4 softtabstop=4 expandtab textwidth=79: