extern/apprise
1
0
Fork 0
mirror of https://github.com/caronc/apprise.git synced 2025-06-22 10:41:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Resolves error response on successful Slack post (#196)

Browse Source
This commit is contained in:
Chris Caron 2020-01-17 18:16:45 -05:00 committed by GitHub
parent 2e6a996980
commit 384dd94b06
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
apprise/plugins/NotifySlack.py
View File

@ -525,25 +525,29 @@ class NotifySlack(NotifyBase):
'Response Details:\r\n{}'.format(r.content)) 'Response Details:\r\n{}'.format(r.content))
return False return False
try: elif attach:
response = loads(r.content) # Attachment posts return a JSON string
try:
response = loads(r.content)
except (AttributeError, TypeError, ValueError): except (AttributeError, TypeError, ValueError):
# ValueError = r.content is Unparsable # ValueError = r.content is Unparsable
# TypeError = r.content is None # TypeError = r.content is None
# AttributeError = r is None # AttributeError = r is None
pass pass
if not (response and response.get('ok', True)): if not (response and response.get('ok', True)):
# Bare minimum requirements not met # Bare minimum requirements not met
self.logger.warning( self.logger.warning(
'Failed to send {}to Slack: error={}.'.format( 'Failed to send {}to Slack: error={}.'.format(
attach.name if attach else '', attach.name if attach else '',
r.status_code)) r.status_code))
self.logger.debug( self.logger.debug(
'Response Details:\r\n{}'.format(r.content)) 'Response Details:\r\n{}'.format(r.content))
return False return False
else:
response = r.content
# Message Post Response looks like this: # Message Post Response looks like this:
# { # {

4
test/test_slack_plugin.py
View File

@ -116,7 +116,7 @@ def test_slack_oauth_access_token(mock_post):
request.content = '{' request.content = '{'
# As a result, we'll fail to send our notification # As a result, we'll fail to send our notification
assert obj.send(body="test") is False assert obj.send(body="test", attach=attach) is False
request.content = dumps({ request.content = dumps({
'ok': False, 'ok': False,
@ -125,7 +125,7 @@ def test_slack_oauth_access_token(mock_post):
# A response from Slack (even with a 200 response) still # A response from Slack (even with a 200 response) still
# results in a failure: # results in a failure:
assert obj.send(body="test") is False assert obj.send(body="test", attach=attach) is False
# Handle exceptions reading our attachment from disk (should it happen) # Handle exceptions reading our attachment from disk (should it happen)
mock_post.side_effect = OSError("Attachment Error") mock_post.side_effect = OSError("Attachment Error")