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

outgoing webhook tests: Simplify response mock.

Browse Source 
Before this commit, ResponseMock() was initialized
with a data attribute, which isn't used in the tests
and does not occur in the outgoing webhook code.
This commit is contained in:
derAnfaenger
2017-11-03 13:12:59 +01:00
committed by Tim Abbott
parent 909631b5a9
commit 84328320eb
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
zerver/tests/test_outgoing_webhook_system.py
View File

@@ -14,10 +14,9 @@ from zerver.lib.test_classes import ZulipTestCase
from zerver.models import get_realm, get_user from zerver.models import get_realm, get_user
class ResponseMock(object): class ResponseMock(object):
def __init__(self, status_code, data, content): def __init__(self, status_code, content):
# type: (int, Any, str) -> None # type: (int, Any) -> None
self.status_code = status_code self.status_code = status_code
self.data = data
self.content = content self.content = content
def request_exception_error(http_method, final_url, data, **request_kwargs): def request_exception_error(http_method, final_url, data, **request_kwargs):
@@ -63,14 +62,14 @@ class DoRestCallTests(ZulipTestCase):
@mock.patch('zerver.lib.outgoing_webhook.succeed_with_message') @mock.patch('zerver.lib.outgoing_webhook.succeed_with_message')
def test_successful_request(self, mock_succeed_with_message): def test_successful_request(self, mock_succeed_with_message):
# type: (mock.Mock) -> None # type: (mock.Mock) -> None
response = ResponseMock(200, {"message": "testing"}, '') response = ResponseMock(200)
with mock.patch('requests.request', return_value=response): with mock.patch('requests.request', return_value=response):
do_rest_call(self.rest_operation, None, self.mock_event, service_handler, None) do_rest_call(self.rest_operation, None, self.mock_event, service_handler, None)
self.assertTrue(mock_succeed_with_message.called) self.assertTrue(mock_succeed_with_message.called)
def test_retry_request(self): def test_retry_request(self):
# type: (mock.Mock) -> None # type: (mock.Mock) -> None
response = ResponseMock(500, {"message": "testing"}, '') response = ResponseMock(500)
self.mock_event['failed_tries'] = 3 self.mock_event['failed_tries'] = 3
with mock.patch('requests.request', return_value=response): with mock.patch('requests.request', return_value=response):
@@ -85,7 +84,7 @@ The webhook got a response with status code *500*.''')
@mock.patch('zerver.lib.outgoing_webhook.fail_with_message') @mock.patch('zerver.lib.outgoing_webhook.fail_with_message')
def test_fail_request(self, mock_fail_with_message): def test_fail_request(self, mock_fail_with_message):
# type: (mock.Mock) -> None # type: (mock.Mock) -> None
response = ResponseMock(400, {"message": "testing"}, '') response = ResponseMock(400)
with mock.patch('requests.request', return_value=response): with mock.patch('requests.request', return_value=response):
do_rest_call(self.rest_operation, None, self.mock_event, service_handler, None) do_rest_call(self.rest_operation, None, self.mock_event, service_handler, None)
bot_owner_notification = self.get_last_message() bot_owner_notification = self.get_last_message()