From 5565c30f0b25996a0e73477fc0e1e1aced52b926 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Batuhan=20Ta=C5=9Fkaya?= Date: Thu, 16 Apr 2020 20:29:12 +0300 Subject: bpo-39793: use the same domain on make_msgid tests (#18698) * bpo-39793: use same domain on make_msgid tests * apply suggestions --- Lib/test/test_email/test_email.py | 10 ++++++---- .../NEWS.d/next/Tests/2020-02-29-12-58-17.bpo-39793.Og2SUN.rst | 1 + 2 files changed, 7 insertions(+), 4 deletions(-) create mode 100644 Misc/NEWS.d/next/Tests/2020-02-29-12-58-17.bpo-39793.Og2SUN.rst diff --git a/Lib/test/test_email/test_email.py b/Lib/test/test_email/test_email.py index 8ec3919..59eabb0 100644 --- a/Lib/test/test_email/test_email.py +++ b/Lib/test/test_email/test_email.py @@ -11,8 +11,8 @@ import textwrap 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 @@ -3342,9 +3342,11 @@ multipart/report '.test-idstring@testdomain-string>') def test_make_msgid_default_domain(self): - self.assertTrue( - email.utils.make_msgid().endswith( - '@' + getfqdn() + '>')) + 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. diff --git a/Misc/NEWS.d/next/Tests/2020-02-29-12-58-17.bpo-39793.Og2SUN.rst b/Misc/NEWS.d/next/Tests/2020-02-29-12-58-17.bpo-39793.Og2SUN.rst new file mode 100644 index 0000000..6fa0d15 --- /dev/null +++ b/Misc/NEWS.d/next/Tests/2020-02-29-12-58-17.bpo-39793.Og2SUN.rst @@ -0,0 +1 @@ +Use the same domain when testing ``make_msgid``. Patch by Batuhan Taskaya. -- cgit v0.12