From 992a5de77d7109cb045a72e4ed5e2a4121d72b47 Mon Sep 17 00:00:00 2001 From: Peter Jiping Xie Date: Mon, 30 Jan 2023 20:36:41 +1100 Subject: [PATCH 1/3] add socket timeout to ThreadedVSOCKSocketStreamTest and skip it on WSL --- Lib/test/test_socket.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py index f1b4018c265e18..03fba8724f41e4 100644 --- a/Lib/test/test_socket.py +++ b/Lib/test/test_socket.py @@ -45,6 +45,7 @@ VSOCKPORT = 1234 AIX = platform.system() == "AIX" +WSL = "microsoft-standard-WSL" in platform.release() try: import _socket @@ -498,6 +499,7 @@ def clientTearDown(self): ThreadableTest.clientTearDown(self) @unittest.skipIf(fcntl is None, "need fcntl") +@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, @@ -514,6 +516,7 @@ def setUp(self): self.serv.bind((socket.VMADDR_CID_ANY, VSOCKPORT)) self.serv.listen() self.serverExplicitReady() + self.serv.settimeout(support.LOOPBACK_TIMEOUT) self.conn, self.connaddr = self.serv.accept() self.addCleanup(self.conn.close) From c5140bdb784a705d791e0030f0d482456f39aa21 Mon Sep 17 00:00:00 2001 From: "blurb-it[bot]" <43283697+blurb-it[bot]@users.noreply.github.com> Date: Mon, 30 Jan 2023 09:42:03 +0000 Subject: [PATCH 2/3] =?UTF-8?q?=F0=9F=93=9C=F0=9F=A4=96=20Added=20by=20blu?= =?UTF-8?q?rb=5Fit.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../next/Tests/2023-01-30-09-42-02.gh-issue-101384.CDM5rJ.rst | 1 + 1 file changed, 1 insertion(+) create mode 100644 Misc/NEWS.d/next/Tests/2023-01-30-09-42-02.gh-issue-101384.CDM5rJ.rst diff --git a/Misc/NEWS.d/next/Tests/2023-01-30-09-42-02.gh-issue-101384.CDM5rJ.rst b/Misc/NEWS.d/next/Tests/2023-01-30-09-42-02.gh-issue-101384.CDM5rJ.rst new file mode 100644 index 00000000000000..57766f43eac981 --- /dev/null +++ b/Misc/NEWS.d/next/Tests/2023-01-30-09-42-02.gh-issue-101384.CDM5rJ.rst @@ -0,0 +1 @@ +add socket timeout to ThreadedVSOCKSocketStreamTest and skip it on WSL. From dd0e869eaa12f436965d38ac3138a90d335da8bb Mon Sep 17 00:00:00 2001 From: Serhiy Storchaka Date: Sat, 17 Feb 2024 10:54:16 +0200 Subject: [PATCH 3/3] Delete Misc/NEWS.d/next/Tests/2023-01-30-09-42-02.gh-issue-101384.CDM5rJ.rst --- .../next/Tests/2023-01-30-09-42-02.gh-issue-101384.CDM5rJ.rst | 1 - 1 file changed, 1 deletion(-) delete mode 100644 Misc/NEWS.d/next/Tests/2023-01-30-09-42-02.gh-issue-101384.CDM5rJ.rst diff --git a/Misc/NEWS.d/next/Tests/2023-01-30-09-42-02.gh-issue-101384.CDM5rJ.rst b/Misc/NEWS.d/next/Tests/2023-01-30-09-42-02.gh-issue-101384.CDM5rJ.rst deleted file mode 100644 index 57766f43eac981..00000000000000 --- a/Misc/NEWS.d/next/Tests/2023-01-30-09-42-02.gh-issue-101384.CDM5rJ.rst +++ /dev/null @@ -1 +0,0 @@ -add socket timeout to ThreadedVSOCKSocketStreamTest and skip it on WSL.