Merge #28407 Improve test coverage of make_msgid.

Author: bitdancer

Lib/test/test_email/test_email.py

@@ -11,6 +11,7 @@
 from io import StringIO, BytesIO
 from itertools import chain
 from random import choice
+from socket import getfqdn
 try:
     from threading import Thread
 except ImportError:
@@ -3314,6 +3315,17 @@ def test_make_msgid_domain(self):
             email.utils.make_msgid(domain='testdomain-string')[-19:],
             '@testdomain-string>')
 
+    def test_make_msgid_idstring(self):
+        self.assertEqual(
+            email.utils.make_msgid(idstring='test-idstring',
+                domain='testdomain-string')[-33:],
+            '.test-idstring@testdomain-string>')
+
+    def test_make_msgid_default_domain(self):
+        self.assertTrue(
+            email.utils.make_msgid().endswith(
+                '@' + getfqdn() + '>'))
+
     def test_Generator_linend(self):
         # Issue 14645.
         with openfile('msg_26.txt', newline='\n') as f:

Misc/ACKS

@@ -189,6 +189,7 @@ Tom Bridgman
 Anthony Briggs
 Keith Briggs
 Tobias Brink
+Dillon Brock
 Richard Brodie
 Michael Broghton
 Ammar Brohi