From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Sun, 2 Feb 2025 05:04:45 +0000 (+0100)
Subject: [3.12] gh-119461: Restore the testSocket VSOCK skipUnless removed by PR GH-119465... 
X-Git-Tag: v3.12.9~15
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=368ba55819cc44d7fe6c364845dbd3725e2f70d4;p=thirdparty%2FPython%2Fcpython.git

[3.12] gh-119461: Restore the testSocket VSOCK skipUnless removed by PR GH-119465 (GH-129561) (#129565)

gh-119461: Restore the testSocket VSOCK skipUnless removed by PR GH-119465 (GH-129561)

Restore the skipUnless removed by GH-119465.

This test can only pass on virtual machines, not actual machines.

actual machines see:

```
    self.cli.connect((cid, VSOCKPORT))
    ~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^
OSError: [Errno 19] No such device
```

Reproduced on (Linux) Ubuntu 24.04.1 running 6.8.0-52-generic.
(cherry picked from commit e1006ce1ded1b18972888ef057718dba6f2c7edd)

Co-authored-by: Gregory P. Smith <greg@krypto.org>
---

diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
index 8fda0d7f8bac..8c489f559e6c 100644
--- a/Lib/test/test_socket.py
+++ b/Lib/test/test_socket.py
@@ -486,6 +486,8 @@ class ThreadedRDSSocketTest(SocketRDSTest, ThreadableTest):
 @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,  # VMADDR_CID_HOST
+                     "This test can only be run on a virtual guest.")
 class ThreadedVSOCKSocketStreamTest(unittest.TestCase, ThreadableTest):
 
     def __init__(self, methodName='runTest'):