From: Matěj Cepl <mcepl@cepl.eu>
Date: Tue, 12 Feb 2019 18:30:19 +0000 (+0100)
Subject: bpo-35505: Skip test_imap4_host_default_value if localhost listens on IMAP port ... 
X-Git-Tag: v3.8.0a2~86
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3dc67d0316740e78e7cd014343f34d85908219b7;p=python

bpo-35505: Skip test_imap4_host_default_value if localhost listens on IMAP port (GH-11823)

Make test_imap4_host_default_value independent on whether the
local IMAP server is running.
---

diff --git a/Lib/test/test_imaplib.py b/Lib/test/test_imaplib.py
index a0b598d0c7..a060143e1f 100644
--- a/Lib/test/test_imaplib.py
+++ b/Lib/test/test_imaplib.py
@@ -8,6 +8,7 @@ import socketserver
 import time
 import calendar
 import threading
+import socket
 
 from test.support import (reap_threads, verbose, transient_internet,
                           run_with_tz, run_with_locale, cpython_only)
@@ -71,6 +72,15 @@ class TestImaplib(unittest.TestCase):
             imaplib.Time2Internaldate(t)
 
     def test_imap4_host_default_value(self):
+        # Check whether the IMAP4_PORT is truly unavailable.
+        with socket.socket() as s:
+            try:
+                s.connect(('', imaplib.IMAP4_PORT))
+                self.skipTest(
+                    "Cannot run the test with local IMAP server running.")
+            except socket.error:
+                pass
+
         expected_errnos = [
             # This is the exception that should be raised.
             errno.ECONNREFUSED,
diff --git a/Misc/NEWS.d/next/Tests/2019-02-12-01-33-08.bpo-35505.N9ba_K.rst b/Misc/NEWS.d/next/Tests/2019-02-12-01-33-08.bpo-35505.N9ba_K.rst
new file mode 100644
index 0000000000..f1d48d6120
--- /dev/null
+++ b/Misc/NEWS.d/next/Tests/2019-02-12-01-33-08.bpo-35505.N9ba_K.rst
@@ -0,0 +1,2 @@
+Make test_imap4_host_default_value independent on whether the 
+local IMAP server is running.