]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
gh-113879: Fix ResourceWarning in test_asyncio.test_server (GH-113881)
authorSerhiy Storchaka <storchaka@gmail.com>
Wed, 10 Jan 2024 10:38:36 +0000 (12:38 +0200)
committerGitHub <noreply@github.com>
Wed, 10 Jan 2024 10:38:36 +0000 (12:38 +0200)
Lib/test/test_asyncio/test_server.py

index f22cf3026e244baa91d34bca3f6d027a69e2e38a..918faac909b9bfd91240a57554ad7784df07f645 100644 (file)
@@ -200,13 +200,13 @@ class UnixServerCleanupTests(unittest.IsolatedAsyncioTestCase):
             async def serve(*args):
                 pass
 
-            sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
-            sock.bind(addr)
+            with socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) as sock:
+                sock.bind(addr)
 
-            srv = await asyncio.start_unix_server(serve, sock=sock)
+                srv = await asyncio.start_unix_server(serve, sock=sock)
 
-            srv.close()
-            self.assertFalse(os.path.exists(addr))
+                srv.close()
+                self.assertFalse(os.path.exists(addr))
 
     @socket_helper.skip_unless_bind_unix_socket
     async def test_unix_server_cleanup_gone(self):
@@ -215,14 +215,14 @@ class UnixServerCleanupTests(unittest.IsolatedAsyncioTestCase):
             async def serve(*args):
                 pass
 
-            sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
-            sock.bind(addr)
+            with socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) as sock:
+                sock.bind(addr)
 
-            srv = await asyncio.start_unix_server(serve, sock=sock)
+                srv = await asyncio.start_unix_server(serve, sock=sock)
 
-            os.unlink(addr)
+                os.unlink(addr)
 
-            srv.close()
+                srv.close()
 
     @socket_helper.skip_unless_bind_unix_socket
     async def test_unix_server_cleanup_replaced(self):
@@ -234,11 +234,11 @@ class UnixServerCleanupTests(unittest.IsolatedAsyncioTestCase):
             srv = await asyncio.start_unix_server(serve, addr)
 
             os.unlink(addr)
-            sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
-            sock.bind(addr)
+            with socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) as sock:
+                sock.bind(addr)
 
-            srv.close()
-            self.assertTrue(os.path.exists(addr))
+                srv.close()
+                self.assertTrue(os.path.exists(addr))
 
     @socket_helper.skip_unless_bind_unix_socket
     async def test_unix_server_cleanup_prevented(self):