Skip to content

bpo-39793: use the same domain on make_msgid tests #18698

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
akuchling merged 2 commits into from
Apr 16, 2020
Merged

bpo-39793: use the same domain on make_msgid tests #18698

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4e01533
bpo-39793: use same domain on make_msgid tests
isidentical Feb 29, 2020
50ddd37
apply suggestions
isidentical Mar 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
apply suggestions
  • Loading branch information
@isidentical
isidentical committed Mar 5, 2020
commit 50ddd37533ffdd83cb4c0123025b3d0616389988
11 changes: 6 additions & 5 deletions Lib/test/test_email/test_email.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
from io import StringIO, BytesIO
from itertools import chain
from random import choice
from socket import getfqdn
from threading import Thread
from unittest.mock import patch

import email
import email.policy
Expand Down Expand Up @@ -3342,10 +3342,11 @@ def test_make_msgid_idstring(self):
'.test-idstring@testdomain-string>')

def test_make_msgid_default_domain(self):
Comment thread
akuchling marked this conversation as resolved.
domain = getfqdn() # ensure the domain wont change (bpo-39793)
self.assertTrue(
email.utils.make_msgid(domain=domain).endswith(
'@' + domain + '>'))
with patch('socket.getfqdn') as mock_getfqdn:
mock_getfqdn.return_value = domain = 'pythontest.example.com'
self.assertTrue(
email.utils.make_msgid().endswith(
'@' + domain + '>'))

def test_Generator_linend(self):
# Issue 14645.
Expand Down