pythongh-111246: Don't log on redundant socket cleanup (python#111246)

CendioOssman · Oct 30, 2023 · 21e9d8c · 21e9d8c
1 parent 21ff6be
commit 21e9d8c
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/Lib/asyncio/unix_events.py b/Lib/asyncio/unix_events.py
@@ -477,6 +477,8 @@ def _stop_serving(self, sock):
         if path is not None:
             try:
                 os.unlink(path)
+            except FileNotFoundError:
+                pass
             except OSError as err:
                 logger.error('Unable to clean up listening UNIX socket '
                              '%r: %r', path, err)

diff --git a/Lib/test/test_asyncio/test_server.py b/Lib/test/test_asyncio/test_server.py
@@ -175,6 +175,21 @@ async def serve(*args):
             srv.close()
             self.assertFalse(os.path.exists(addr))
 
+    @socket_helper.skip_unless_bind_unix_socket
+    async def test_unix_server_cleanup_gone(self):
+        with test_utils.unix_socket_path() as addr:
+            async def serve(*args):
+                pass
+
+            sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
+            sock.bind(addr)
+
+            srv = await asyncio.start_unix_server(serve, sock=sock)
+
+            os.unlink(addr)
+
+            srv.close()
+
 
 @unittest.skipUnless(hasattr(asyncio, 'ProactorEventLoop'), 'Windows only')
 class ProactorStartServerTests(BaseStartServer, unittest.TestCase):