From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Wed, 1 Apr 2020 01:25:34 +0000 (-0700)
Subject: Handle when IOCTL_VM_SOCKETS_GET_LOCAL_CID does not exist in "socket" (GH-19270)
X-Git-Tag: v3.8.3rc1~66
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6acafee247849b39d65dd0d61c6e57a6ffabdc32;p=thirdparty%2FPython%2Fcpython.git

Handle when IOCTL_VM_SOCKETS_GET_LOCAL_CID does not exist in "socket" (GH-19270)


Running `test_socket` or anything that depends on it (like python -m
test.pythoninfo) crashes if IOCTL_VM_SOCKETS_GET_LOCAL_CID does not
exist in the socket module.

Automerge-Triggered-By: @pablogsal
(cherry picked from commit 6eb9619c88612565b424be14196a8adae6d51978)

Co-authored-by: Pablo Galindo <Pablogsal@gmail.com>
---

diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
index 1bf562a03d55..f9370d8e52dc 100644
--- a/Lib/test/test_socket.py
+++ b/Lib/test/test_socket.py
@@ -50,6 +50,8 @@ except ImportError:
 def get_cid():
     if fcntl is None:
         return None
+    if not hasattr(socket, 'IOCTL_VM_SOCKETS_GET_LOCAL_CID'):
+        return None
     try:
         with open("/dev/vsock", "rb") as f:
             r = fcntl.ioctl(f, socket.IOCTL_VM_SOCKETS_GET_LOCAL_CID, "    ")