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

miss-islington · isidentical · web-flow · commit ccf30e96d4bd · 2020-04-16T14:07:52.000-04:00
(cherry picked from commit 5565c30) 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
@@ -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
@@ -3342,9 +3342,11 @@ def test_make_msgid_idstring(self):
             '.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
@@ -0,0 +1 @@
+Use the same domain when testing ``make_msgid``. Patch by Batuhan Taskaya.

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+Use the same domain when testing ``make_msgid``. Patch by Batuhan Taskaya.