From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Thu, 16 Apr 2020 18:07:52 +0000 (-0700)
Subject: bpo-39793: use the same domain on make_msgid tests (GH-18698) (GH-19554)
X-Git-Tag: v3.8.3rc1~29
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ccf30e96d4bdcf04396e00899a0319041144509f;p=thirdparty%2FPython%2Fcpython.git

bpo-39793: use the same domain on make_msgid tests (GH-18698) (GH-19554)

(cherry picked from commit 5565c30f0b25996a0e73477fc0e1e1aced52b926)

Co-authored-by: Batuhan Taşkaya <batuhanosmantaskaya@gmail.com>
---

diff --git a/Lib/test/test_email/test_email.py b/Lib/test/test_email/test_email.py
index 5414cf070cc1..9e5c6adca835 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 000000000000..6fa0d15ba2fd
--- /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.