Skip to content

[3.13] gh-145548: Don't use VMADDR_CID_LOCAL from socket#145735

Merged
encukou merged 1 commit intopython:3.13from
encukou:3.13-VMADDR_CID_LOCAL
Mar 10, 2026
Merged

[3.13] gh-145548: Don't use VMADDR_CID_LOCAL from socket#145735
encukou merged 1 commit intopython:3.13from
encukou:3.13-VMADDR_CID_LOCAL

Conversation

@encukou
Copy link
Copy Markdown
Member

@encukou encukou commented Mar 10, 2026

VMADDR_CID_LOCAL was added to socket in 3.14.
For 3.13, the test needs a local constant in setUp(), as in clientSetUp().

VMADDR_CID_LOCAL was added to `socekt` in 3.14. The test needs a
local constant in setUp(), as in clientSetUp().
@encukou
Copy link
Copy Markdown
Member Author

encukou commented Mar 10, 2026

!buildbot Fedora.Stable$

@bedevere-bot
Copy link
Copy Markdown

The regex 'Fedora.Stable$' did not match any buildbot builder. Is the requested builder in the list of stable builders?

@encukou
Copy link
Copy Markdown
Member Author

encukou commented Mar 10, 2026

!buildbot Fedora.Stable

@bedevere-bot
Copy link
Copy Markdown

🤖 New build scheduled with the buildbot fleet by @encukou for commit 9a6de87 🤖

Results will be shown at:

https://buildbot.python.org/all/#/grid?branch=refs%2Fpull%2F145735%2Fmerge

The command will test the builders whose names match following regular expression: Fedora.Stable

The builders matched are:

  • AMD64 Fedora Stable Refleaks PR
  • AMD64 Fedora Stable PR
  • PPC64LE Fedora Stable Refleaks PR
  • aarch64 Fedora Stable LTO + PGO PR
  • PPC64LE Fedora Stable LTO PR
  • aarch64 Fedora Stable Refleaks PR
  • aarch64 Fedora Stable Clang PR
  • PPC64LE Fedora Stable Clang PR
  • s390x Fedora Stable Clang Installed PR
  • AMD64 Fedora Stable Clang PR
  • PPC64LE Fedora Stable Clang Installed PR
  • PPC64LE Fedora Stable PR
  • AMD64 Fedora Stable Clang Installed PR
  • s390x Fedora Stable LTO PR
  • s390x Fedora Stable PR
  • s390x Fedora Stable Clang PR
  • s390x Fedora Stable Refleaks PR
  • PPC64LE Fedora Stable LTO + PGO PR
  • AMD64 Fedora Stable LTO + PGO PR
  • aarch64 Fedora Stable LTO PR
  • aarch64 Fedora Stable PR
  • aarch64 Fedora Stable Clang Installed PR
  • s390x Fedora Stable LTO + PGO PR
  • AMD64 Fedora Stable LTO PR

Copy link
Copy Markdown
Member

@vstinner vstinner left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM.

I tested manually on Fedora Stable x86-64: the change works as expected. The test is skipped:

testStream (test.test_socket.ThreadedVSOCKSocketStreamTest.testStream) ... skipped "bind() failed with OSError(99, 'Cannot assign requested address')"

@encukou encukou merged commit 26326a0 into python:3.13 Mar 10, 2026
69 checks passed
@encukou encukou deleted the 3.13-VMADDR_CID_LOCAL branch March 10, 2026 15:02
encukou added a commit to encukou/cpython that referenced this pull request Mar 11, 2026
…honGH-145735)

VMADDR_CID_LOCAL was added to `socekt` in 3.14. The test needs a
local constant in setUp(), as in clientSetUp().
Yhg1s pushed a commit that referenced this pull request Apr 15, 2026
…) (#145809)

* [3.12] gh-145548: Use VMADDR_CID_LOCAL in VSOCK socket tests (GH-145589) (GH-145594)

Prefer VMADDR_CID_LOCAL instead of VMADDR_CID_ANY for bind() in the
server. Skip the test if bind() fails with EADDRNOTAVAIL.

Log vsock CID in test.pythoninfo.
(cherry picked from commit 6c8c72f)
(cherry picked from commit 16dbbe5)

* [3.13] gh-145548: Don't use VMADDR_CID_LOCAL from `socket` (GH-145735)

VMADDR_CID_LOCAL was added to `socekt` in 3.14. The test needs a
local constant in setUp(), as in clientSetUp().

Co-authored-by: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Co-authored-by: Victor Stinner <vstinner@python.org>
miss-islington added a commit to miss-islington/cpython that referenced this pull request Apr 15, 2026
…ythonGH-145589) (pythonGH-145809)

* [3.12] pythongh-145548: Use VMADDR_CID_LOCAL in VSOCK socket tests (pythonGH-145589) (pythonGH-145594)

Prefer VMADDR_CID_LOCAL instead of VMADDR_CID_ANY for bind() in the
server. Skip the test if bind() fails with EADDRNOTAVAIL.

Log vsock CID in test.pythoninfo.
(cherry picked from commit 6c8c72f)
(cherry picked from commit 16dbbe5)

* [3.13] pythongh-145548: Don't use VMADDR_CID_LOCAL from `socket` (pythonGH-145735)

VMADDR_CID_LOCAL was added to `socekt` in 3.14. The test needs a
local constant in setUp(), as in clientSetUp().
(cherry picked from commit e378eda)

Co-authored-by: Petr Viktorin <encukou@gmail.com>
Co-authored-by: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Co-authored-by: Victor Stinner <vstinner@python.org>
miss-islington added a commit to miss-islington/cpython that referenced this pull request Apr 15, 2026
…ythonGH-145589) (pythonGH-145809)

* [3.12] pythongh-145548: Use VMADDR_CID_LOCAL in VSOCK socket tests (pythonGH-145589) (pythonGH-145594)

Prefer VMADDR_CID_LOCAL instead of VMADDR_CID_ANY for bind() in the
server. Skip the test if bind() fails with EADDRNOTAVAIL.

Log vsock CID in test.pythoninfo.
(cherry picked from commit 6c8c72f)
(cherry picked from commit 16dbbe5)

* [3.13] pythongh-145548: Don't use VMADDR_CID_LOCAL from `socket` (pythonGH-145735)

VMADDR_CID_LOCAL was added to `socekt` in 3.14. The test needs a
local constant in setUp(), as in clientSetUp().
(cherry picked from commit e378eda)

Co-authored-by: Petr Viktorin <encukou@gmail.com>
Co-authored-by: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Co-authored-by: Victor Stinner <vstinner@python.org>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

skip news tests Tests in the Lib/test dir

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants