paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-12 18:06:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

tornado: Delete fake_message_sender.

Browse Source 
This test helper method duplicated a bunch of logic in
`zerver/worker/queue_processors.py` in a specialized fashion for the
tests.  Now that we're using `call_consume_in_tests` in this code
path, we don't need it.
This commit is contained in:
Tim Abbott
2017-11-03 14:11:23 -07:00
parent eade4d0052
commit c3db9513f2
1 changed files with 1 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
zerver/tornado/socket.py
View File

@@ -220,7 +220,7 @@ class SocketConnection(sockjs.tornado.SockJSConnection):
return_queue="tornado_return", return_queue="tornado_return",
log_data=log_data, log_data=log_data,
request_environ=dict(REMOTE_ADDR=self.session.conn_info.ip))), request_environ=dict(REMOTE_ADDR=self.session.conn_info.ip))),
fake_message_sender, call_consume_in_tests=True) lambda x: None, call_consume_in_tests=True)
def on_close(self) -> None: def on_close(self) -> None:
log_data = dict(extra='[transport=%s]' % (self.session.transport_name,)) log_data = dict(extra='[transport=%s]' % (self.session.transport_name,))
@@ -240,33 +240,6 @@ class SocketConnection(sockjs.tornado.SockJSConnection):
self.did_close = True self.did_close = True
def fake_message_sender(event: Dict[str, Any]) -> None:
"""This function is used only for Casper and backend tests, where
rabbitmq is disabled"""
log_data = dict() # type: Dict[str, Any]
record_request_start_data(log_data)
req = event['request']
try:
sender = get_user_profile_by_id(event['server_meta']['user_id'])
client = get_client("website")
msg_id = check_send_message(sender, client, req['type'],
extract_recipients(req['to']),
req['subject'], req['content'],
local_id=req.get('local_id', None),
sender_queue_id=req.get('queue_id', None))
resp = {"result": "success", "msg": "", "id": msg_id}
except JsonableError as e:
resp = {"result": "error", "msg": str(e)}
server_meta = event['server_meta']
server_meta.update({'worker_log_data': log_data,
'time_request_finished': time.time()})
result = {'response': resp, 'req_id': event['req_id'],
'server_meta': server_meta}
respond_send_message(result)
def respond_send_message(data: Mapping[str, Any]) -> None: def respond_send_message(data: Mapping[str, Any]) -> None:
log_data = data['server_meta']['log_data'] log_data = data['server_meta']['log_data']
record_request_restart_data(log_data) record_request_restart_data(log_data)