xenofem/python-zulip-api
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

zulip_bots: Make xkcd bot error more verbose.

Browse source
This commit is contained in:
Josh Mandel 2017-11-09 19:14:30 -05:00 committed by Robert Hönig
parent 0eb285da29
commit 94b7c2eaef
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
zulip_bots/zulip_bots/bots/xkcd/test_xkcd.py
View file

@ -13,7 +13,7 @@ class TestXkcdBot(BotTestCase):
@mock.patch('logging.exception') @mock.patch('logging.exception')
def test_bot(self, mock_logging_exception): def test_bot(self, mock_logging_exception):
help_txt = "xkcd bot supports these commands:" help_txt = "xkcd bot supports these commands:"
err_txt = "xkcd bot only supports these commands:" err_txt = "xkcd bot only supports these commands, not `{}`:"
commands = ''' commands = '''
* `@xkcd help` to show this help message. * `@xkcd help` to show this help message.
* `@xkcd latest` to fetch the latest comic strip from xkcd. * `@xkcd latest` to fetch the latest comic strip from xkcd.
@ -78,7 +78,7 @@ class TestXkcdBot(BotTestCase):
) )
# Empty query, no request made to the Internet. # Empty query, no request made to the Internet.
bot_response = err_txt+commands bot_response = err_txt.format('')+commands
self.assert_bot_response( self.assert_bot_response(
message = {'content': ''}, message = {'content': ''},
response = {'content': bot_response}, response = {'content': bot_response},
@ -94,7 +94,7 @@ class TestXkcdBot(BotTestCase):
) )
# wrong command. # wrong command.
bot_response = err_txt+commands bot_response = err_txt.format('x')+commands
self.assert_bot_response( self.assert_bot_response(
message = {'content': 'x'}, message = {'content': 'x'},
response = {'content': bot_response}, response = {'content': bot_response},

2
zulip_bots/zulip_bots/bots/xkcd/xkcd.py
View file

@ -68,7 +68,7 @@ def get_xkcd_bot_response(message):
elif command.isdigit(): elif command.isdigit():
fetched = fetch_xkcd_query(XkcdBotCommand.COMIC_ID, command) fetched = fetch_xkcd_query(XkcdBotCommand.COMIC_ID, command)
else: else:
return commands_help % ('xkcd bot only supports these commands:') return commands_help % ("xkcd bot only supports these commands, not `%s`:" % (command,))
except (requests.exceptions.ConnectionError, XkcdServerError): except (requests.exceptions.ConnectionError, XkcdServerError):
logging.exception('Connection error occurred when trying to connect to xkcd server') logging.exception('Connection error occurred when trying to connect to xkcd server')
return 'Sorry, I cannot process your request right now, please try again later!' return 'Sorry, I cannot process your request right now, please try again later!'