paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-03 21:43:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

test_hooks: Fix missing assert_json_success checks.

Browse Source 
Several recently merged webhooks were incorrectly not checking that
the actual webhook result didn't return an error.  While they would
usually still fail in most cases when checking whether the message
came back correctly, this hid the root cause errors and thus made it
much harder to debug.
This commit is contained in:
Tim Abbott
2016-04-27 13:25:21 -07:00
parent e6cfd917a5
commit c9359bd75a
1 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
zerver/tests/test_hooks.py
View File

@@ -852,10 +852,11 @@ class TravisHookTests(AuthedTestCase):
url = "/api/v1/external/travis?stream=%s&topic=builds&api_key=%s" % (stream, api_key) url = "/api/v1/external/travis?stream=%s&topic=builds&api_key=%s" % (stream, api_key)
self.subscribe_to_stream(email, stream) self.subscribe_to_stream(email, stream)
self.client.post(url, result = self.client.post(url,
body, body,
stream_name=stream, stream_name=stream,
content_type="application/x-www-form-urlencoded") content_type="application/x-www-form-urlencoded")
self.assert_json_success(result)
msg = self.get_last_message() msg = self.get_last_message()
u'Author: josh_mandel\nBuild status: Passed :thumbsup:\nDetails: [changes](https://github.com/hl7-fhir/fhir-svn/compare/6dccb98bcfd9...6c457d366a31), [build log](https://travis-ci.org/hl7-fhir/fhir-svn/builds/92495257)' u'Author: josh_mandel\nBuild status: Passed :thumbsup:\nDetails: [changes](https://github.com/hl7-fhir/fhir-svn/compare/6dccb98bcfd9...6c457d366a31), [build log](https://travis-ci.org/hl7-fhir/fhir-svn/builds/92495257)'
@@ -928,7 +929,8 @@ class PingdomHookTests(AuthedTestCase):
return ujson.dumps(ujson.loads(self.fixture_data('pingdom', name))) return ujson.dumps(ujson.loads(self.fixture_data('pingdom', name)))
def _send_post_request_with_params(self, json): def _send_post_request_with_params(self, json):
return self.client.post(self._url, json, stream_name=self.STREAM_NAME, content_type="application/json") result = self.client.post(self._url, json, stream_name=self.STREAM_NAME, content_type="application/json")
self.assert_json_success(result)
class YoHookTests(AuthedTestCase): class YoHookTests(AuthedTestCase):
def test_yo_message(self): def test_yo_message(self):
@@ -944,9 +946,9 @@ class YoHookTests(AuthedTestCase):
ip = "127.0.0.1" ip = "127.0.0.1"
url = "/api/v1/external/yo?email=%s&api_key=%s&username=%s&user_ip=%s" % (email, api_key, sender, ip) url = "/api/v1/external/yo?email=%s&api_key=%s&username=%s&user_ip=%s" % (email, api_key, sender, ip)
self.client.get(url, result = self.client.get(url, body,
body, content_type="application/x-www-form-urlencoded")
content_type="application/x-www-form-urlencoded") self.assert_json_success(result)
msg = self.get_last_message() msg = self.get_last_message()
self.assertEqual(msg.content, (u"Yo from IAGO")) self.assertEqual(msg.content, (u"Yo from IAGO"))
@@ -965,10 +967,11 @@ class TeamcityHookTests(AuthedTestCase):
url = "/api/v1/external/teamcity?stream=%s&api_key=%s" % (stream, api_key) url = "/api/v1/external/teamcity?stream=%s&api_key=%s" % (stream, api_key)
self.subscribe_to_stream(email, stream) self.subscribe_to_stream(email, stream)
self.client.post(url, result = self.client.post(url,
body, body,
stream_name=stream, stream_name=stream,
content_type="application/json") content_type="application/json")
self.assert_json_success(result)
return self.get_last_message() return self.get_last_message()
@@ -1059,4 +1062,6 @@ class CodeshipHookTests(AuthedTestCase):
return ujson.dumps(ujson.loads(self.fixture_data('codeship', name))) return ujson.dumps(ujson.loads(self.fixture_data('codeship', name)))
def _send_post_request_with_params(self, json): def _send_post_request_with_params(self, json):
return self.client.post(self._url, json, stream_name=self.STREAM_NAME, content_type="application/json") result = self.client.post(self._url, json, stream_name=self.STREAM_NAME, content_type="application/json")
self.assert_json_success(result)
return result