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_email_mirror: Improve performance of subject stripping tests.

Browse Source 
This used to have a single function test_email_subject_stripping which
would run through a sizeable list of example subjects from subjects.json
fixture, form an email with each subject, send it to the email mirror
and check if the resulting stream message has a correctly stripped
topic. That took too much time, because we run through the entire
process_message and most_recent_message codepaths a lot of times.
We change the way of testing to:
1. Ensure process_message applies subject stripping (only need to run
process_message twice here)
2. Test the strip_from_subject function separately, on all the example
from the subjects.json fixtures. This is very fast.
This commit is contained in:
Mateusz Mandera
2019-03-09 20:36:59 +01:00
parent 0d84be8e4b
commit 518ccec235
1 changed files with 27 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
zerver/tests/test_email_mirror.py
View File

@@ -29,6 +29,7 @@ from zerver.lib.email_mirror import (
process_message, process_stream_message, ZulipEmailForwardError, process_message, process_stream_message, ZulipEmailForwardError,
create_missed_message_address, create_missed_message_address,
get_missed_message_token_from_address, get_missed_message_token_from_address,
strip_from_subject,
) )
from zerver.lib.send_email import FromAddress from zerver.lib.send_email import FromAddress
@@ -649,27 +650,31 @@ class TestEmailMirrorTornadoView(ZulipTestCase):
class TestStreamEmailMessagesSubjectStripping(ZulipTestCase): class TestStreamEmailMessagesSubjectStripping(ZulipTestCase):
def test_email_subject_stripping(self) -> None: def test_process_message_strips_subject(self) -> None:
user_profile = self.example_user('hamlet')
self.login(user_profile.email)
self.subscribe(user_profile, "Denmark")
stream = get_stream("Denmark", user_profile.realm)
stream_to_address = encode_email_address(stream)
incoming_valid_message = MIMEText('TestStreamEmailMessages Body')
incoming_valid_message['Subject'] = "Re: Fwd: Re: Test"
incoming_valid_message['From'] = self.example_email('hamlet')
incoming_valid_message['To'] = stream_to_address
incoming_valid_message['Reply-to'] = self.example_email('othello')
process_message(incoming_valid_message)
message = most_recent_message(user_profile)
self.assertEqual("Test", message.topic_name())
# If after stripping we get an empty subject, it should get set to (no topic)
del incoming_valid_message['Subject']
incoming_valid_message['Subject'] = "Re: Fwd: Re: "
process_message(incoming_valid_message)
message = most_recent_message(user_profile)
self.assertEqual("(no topic)", message.topic_name())
def test_strip_from_subject(self) -> None:
subject_list = ujson.loads(self.fixture_data('subjects.json', type='email')) subject_list = ujson.loads(self.fixture_data('subjects.json', type='email'))
for subject in subject_list: for subject in subject_list:
user_profile = self.example_user('hamlet') stripped = strip_from_subject(subject['original_subject'])
self.login(user_profile.email) self.assertEqual(stripped, subject['stripped_subject'])
self.subscribe(user_profile, "Denmark")
stream = get_stream("Denmark", user_profile.realm)
stream_to_address = encode_email_address(stream)
incoming_valid_message = MIMEText('TestStreamEmailMessages Body')
incoming_valid_message['Subject'] = subject['original_subject']
incoming_valid_message['From'] = self.example_email('hamlet')
incoming_valid_message['To'] = stream_to_address
incoming_valid_message['Reply-to'] = self.example_email('othello')
process_message(incoming_valid_message)
message = most_recent_message(user_profile)
if subject['stripped_subject'] != "":
expected_topic = subject['stripped_subject']
else:
expected_topic = "(no topic)"
self.assertEqual(expected_topic, message.topic_name())