summaryrefslogtreecommitdiff
path: root/tools/test-cloud-meta-mock.py
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2023-03-30 15:24:25 +0200
committerThomas Haller <thaller@redhat.com>2023-03-30 15:36:16 +0200
commit342ee618c75b350cf5cccf49f2bade85c5dfa3ea (patch)
treec6d60cb936cff0a768b605026b27ba19ee771740 /tools/test-cloud-meta-mock.py
parentd533072962a494e701cdb81954c3cd52bd805eca (diff)
downloadNetworkManager-342ee618c75b350cf5cccf49f2bade85c5dfa3ea.tar.gz
client/tests: don't do dup2() dance to pass file descriptor to "tools/test-cloud-meta-mock.py"
"preexec_fn" is not great, because it is not generally safe in multi threaded code (and we don't know whether the test didn't start other threads already, like a GDBus worker thread). Well, it probably is safe, if you only call async signal safe code, but it's not clear what os.dup2() does under the hood. Just avoid that. We can pass on the FD directly.
Diffstat (limited to 'tools/test-cloud-meta-mock.py')
-rwxr-xr-xtools/test-cloud-meta-mock.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/tools/test-cloud-meta-mock.py b/tools/test-cloud-meta-mock.py
index 262dc2ffb3..392955b8ad 100755
--- a/tools/test-cloud-meta-mock.py
+++ b/tools/test-cloud-meta-mock.py
@@ -68,11 +68,9 @@ class SocketHTTPServer(HTTPServer):
# See sd_listen_fds(3)
-fileno = os.getenv("LISTEN_FDS")
+fileno = os.getenv("LISTEN_FD")
if fileno is not None:
- if fileno != "1":
- raise Exception("Bad LISTEN_FDS")
- s = socket.socket(fileno=3)
+ s = socket.socket(fileno=int(fileno))
else:
addr = ("localhost", 0)
s = socket.socket()