From: Victor Stinner <vstinner@python.org>
Date: Fri, 16 Apr 2021 14:37:09 +0000 (+0200)
Subject: bpo-43842: Fix race condition in test_logging SMTP test (GH-25436) (GH-25437) (GH... 
X-Git-Tag: v3.8.10~56
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=816da333c8ee848dab7c830c561b8df0b8d23915;p=thirdparty%2FPython%2Fcpython.git

bpo-43842: Fix race condition in test_logging SMTP test (GH-25436) (GH-25437) (GH-25440)

Fix a race condition in the SMTP test of test_logging. Don't close a
file descriptor (socket) from a different thread while
asyncore.loop() is polling the file descriptor.

(cherry picked from commit 75ec103b3adbb7c619a0e22fa60f3d34c5a9e603)
(cherry picked from commit e1903e11a3d42512effe336026e0c67f602e5848)
---

diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py
index 3e15db03a43a..15250a3a9521 100644
--- a/Lib/test/test_logging.py
+++ b/Lib/test/test_logging.py
@@ -836,6 +836,7 @@ class TestSMTPServer(smtpd.SMTPServer):
         self.port = self.socket.getsockname()[1]
         self._handler = handler
         self._thread = None
+        self._quit = False
         self.poll_interval = poll_interval
 
     def process_message(self, peer, mailfrom, rcpttos, data):
@@ -867,7 +868,8 @@ class TestSMTPServer(smtpd.SMTPServer):
                               :func:`select` or :func:`poll` call by
                               :func:`asyncore.loop`.
         """
-        asyncore.loop(poll_interval, map=self._map)
+        while not self._quit:
+            asyncore.loop(poll_interval, map=self._map, count=1)
 
     def stop(self, timeout=None):
         """
@@ -877,9 +879,10 @@ class TestSMTPServer(smtpd.SMTPServer):
         :param timeout: How long to wait for the server thread
                         to terminate.
         """
-        self.close()
+        self._quit = True
         support.join_thread(self._thread, timeout)
         self._thread = None
+        self.close()
         asyncore.close_all(map=self._map, ignore_all=True)
 
 
diff --git a/Misc/NEWS.d/next/Tests/2021-04-16-14-07-40.bpo-43842.w60GAH.rst b/Misc/NEWS.d/next/Tests/2021-04-16-14-07-40.bpo-43842.w60GAH.rst
new file mode 100644
index 000000000000..5b4a120eb863
--- /dev/null
+++ b/Misc/NEWS.d/next/Tests/2021-04-16-14-07-40.bpo-43842.w60GAH.rst
@@ -0,0 +1,4 @@
+Fix a race condition in the SMTP test of test_logging. Don't close a file
+descriptor (socket) from a different thread while asyncore.loop() is polling
+the file descriptor.
+Patch by Victor Stinner.