paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-10-29 19:13:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

tornado: Use call_consume_in_tests for message_sender queue.

Browse Source 
This increases test coverage of queue_processors.py significantly,
with no real cost, achieving valuable progress torwards #6542.
This commit is contained in:
Tim Abbott
2017-11-03 14:07:19 -07:00
parent f382875d5a
commit eade4d0052
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
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) fake_message_sender, 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,))

7
zerver/worker/queue_processors.py
View File

@@ -33,7 +33,7 @@ from zerver.lib.send_email import send_future_email, send_email_from_dict, \
FromAddress, EmailNotDeliveredException FromAddress, EmailNotDeliveredException
from zerver.lib.email_mirror import process_message as mirror_email from zerver.lib.email_mirror import process_message as mirror_email
from zerver.decorator import JsonableError from zerver.decorator import JsonableError
from zerver.tornado.socket import req_redis_key from zerver.tornado.socket import req_redis_key, respond_send_message
from confirmation.models import Confirmation, create_confirmation_link from confirmation.models import Confirmation, create_confirmation_link
from zerver.lib.db import reset_queries from zerver.lib.db import reset_queries
from zerver.lib.redis_utils import get_redis_client from zerver.lib.redis_utils import get_redis_client
@@ -393,9 +393,8 @@ class MessageSenderWorker(QueueProcessingWorker):
self.redis_client.hmset(redis_key, {'status': 'complete', self.redis_client.hmset(redis_key, {'status': 'complete',
'response': resp_content}) 'response': resp_content})
# Since this sends back to Tornado, we can't use queue_json_publish(server_meta['return_queue'], result,
# call_consume_in_tests here. respond_send_message)
queue_json_publish(server_meta['return_queue'], result, lambda e: None)
@assign_queue('digest_emails') @assign_queue('digest_emails')
class DigestWorker(QueueProcessingWorker): class DigestWorker(QueueProcessingWorker):