-
-
Notifications
You must be signed in to change notification settings - Fork 633
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
5b31505
commit abde592
Showing
1 changed file
with
3 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -125,7 +125,7 @@ def test_send_email_injects_from_with_canonical(self): | |
proper handling in the split. | ||
""" | ||
user = "Test < User" | ||
self.message.replace_header("From", "{} <[email protected]>".format(user)) | ||
self.message.replace_header("From", f"{user} <[email protected]>") | ||
bounce_parameter = self.parameter_model.search( | ||
[("key", "=", "mail.bounce.alias")] | ||
) | ||
|
@@ -145,7 +145,7 @@ def test_send_email_injects_from_with_canonical(self): | |
def test_01_from_outgoing_server_domainone(self): | ||
self._init_mail_server_domain_whilelist_based() | ||
domain = "domainone.com" | ||
email_from = "Mitchell Admin <admin@{}>".format(domain) | ||
email_from = f"Mitchell Admin <admin@{domain}>" | ||
expected_mail_server = self.mail_server_domainone | ||
|
||
self.message.replace_header("From", email_from) | ||
|
@@ -168,7 +168,7 @@ def test_01_from_outgoing_server_domainone(self): | |
def test_02_from_outgoing_server_domaintwo(self): | ||
self._init_mail_server_domain_whilelist_based() | ||
domain = "domaintwo.com" | ||
email_from = "Mitchell Admin <admin@%s>" % domain | ||
email_from = f"Mitchell Admin <admin@{domain}>" | ||
expected_mail_server = self.mail_server_domaintwo | ||
|
||
self.message.replace_header("From", email_from) | ||
|