From 1d31894cc8a443b4089739c34fe83464a5419b97 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Thu, 23 May 2024 15:15:40 +0200 Subject: [PATCH 1/2] gh-119461: Skip ThreadedVSOCKSocketStreamTest if cid is VMADDR_CID_ANY Skip ThreadedVSOCKSocketStreamTest of test_socket if get_cid() returns VMADDR_CID_ANY (-1). --- Lib/test/test_socket.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py index 0c4b3bb2ad4d81..a387cf0a00fb0f 100644 --- a/Lib/test/test_socket.py +++ b/Lib/test/test_socket.py @@ -520,7 +520,7 @@ def clientTearDown(self): @unittest.skipIf(WSL, 'VSOCK does not work on Microsoft WSL') @unittest.skipUnless(HAVE_SOCKET_VSOCK, 'VSOCK sockets required for this test.') -@unittest.skipUnless(get_cid() != 2, +@unittest.skipIf(get_cid() in (2, socket.VMADDR_CID_ANY), "This test can only be run on a virtual guest.") class ThreadedVSOCKSocketStreamTest(unittest.TestCase, ThreadableTest): From 8b3b57b087ac127da3477d2595ad787ea3f0f667 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Thu, 23 May 2024 15:31:42 +0200 Subject: [PATCH 2/2] Replace hardcoded 2 with socket.VMADDR_CID_HOST --- Lib/test/test_socket.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py index a387cf0a00fb0f..58a47b5d9eed0e 100644 --- a/Lib/test/test_socket.py +++ b/Lib/test/test_socket.py @@ -520,7 +520,7 @@ def clientTearDown(self): @unittest.skipIf(WSL, 'VSOCK does not work on Microsoft WSL') @unittest.skipUnless(HAVE_SOCKET_VSOCK, 'VSOCK sockets required for this test.') -@unittest.skipIf(get_cid() in (2, socket.VMADDR_CID_ANY), +@unittest.skipIf(get_cid() in (socket.VMADDR_CID_HOST, socket.VMADDR_CID_ANY), "This test can only be run on a virtual guest.") class ThreadedVSOCKSocketStreamTest(unittest.TestCase, ThreadableTest):