Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[3.10] gh-119461: Fix ThreadedVSOCKSocketStreamTest (GH-129171) #129440

Merged
merged 2 commits into from
Feb 13, 2025

Conversation

miss-islington
Copy link
Contributor

@miss-islington miss-islington commented Jan 29, 2025

Fix ThreadedVSOCKSocketStreamTest: if get_cid() returns the host
address or the "any" address, use the local communication address
(loopback): VMADDR_CID_LOCAL.

On Linux 6.9, apparently, the /dev/vsock device is now available but
get_cid() returns VMADDR_CID_ANY (-1).

(cherry picked from commit 45db419)

Co-authored-by: Victor Stinner vstinner@python.org
(cherry picked from commit e94dbe4)
(cherry picked from commit c750061)
(cherry picked from commit cbfe302)

…29171)

Fix ThreadedVSOCKSocketStreamTest: if get_cid() returns the host
address or the "any" address, use the local communication address
(loopback): VMADDR_CID_LOCAL.

On Linux 6.9, apparently, the /dev/vsock device is now available but
get_cid() returns VMADDR_CID_ANY (-1).

(cherry picked from commit 45db419)

Co-authored-by: Victor Stinner <vstinner@python.org>
(cherry picked from commit e94dbe4)
(cherry picked from commit c750061)
(cherry picked from commit cbfe302)
@encukou
Copy link
Member

encukou commented Jan 30, 2025

!buildbot PPC64LE.Fedora.Stable.Refleaks

@bedevere-bot
Copy link

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

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

The builders matched are:

  • PPC64LE Fedora Stable Refleaks PR

@encukou
Copy link
Member

encukou commented Jan 31, 2025

See #129509 for the RtD preview failure.

This PR does not touch docs so it should be good to merge.

@encukou encukou requested a review from pablogsal January 31, 2025 12:00
@gpshead
Copy link
Member

gpshead commented Feb 2, 2025

If this is merged I recommend also backporting #129561

@encukou
Copy link
Member

encukou commented Feb 3, 2025

Let's add it here & test them together.

@encukou encukou marked this pull request as draft February 3, 2025 14:00
…python#119465 (python#129561)

Restore the skipUnless removed by python#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.
@encukou encukou marked this pull request as ready for review February 3, 2025 14:06
@pablogsal pablogsal merged commit 2bd9f9b into python:3.10 Feb 13, 2025
12 of 13 checks passed
@encukou encukou added the needs backport to 3.9 only security fixes label Feb 13, 2025
@miss-islington-app
Copy link

Thanks @miss-islington for the PR, and @pablogsal for merging it 🌮🎉.. I'm working now to backport this PR to: 3.9.
🐍🍒⛏🤖

miss-islington added a commit to miss-islington/cpython that referenced this pull request Feb 13, 2025
…29171) (pythonGH-129440)

* [3.11] pythongh-119461: Fix ThreadedVSOCKSocketStreamTest (pythonGH-129171)

Fix ThreadedVSOCKSocketStreamTest: if get_cid() returns the host
address or the "any" address, use the local communication address
(loopback): VMADDR_CID_LOCAL.

On Linux 6.9, apparently, the /dev/vsock device is now available but
get_cid() returns VMADDR_CID_ANY (-1).

(cherry picked from commit 45db419)

Co-authored-by: Victor Stinner <vstinner@python.org>
(cherry picked from commit e94dbe4)
(cherry picked from commit c750061)
(cherry picked from commit cbfe302)

* pythongh-119461: Restore the testSocket VSOCK skipUnless removed by PR pythonGH-119465 (pythonGH-129561)

Restore the skipUnless removed by pythonGH-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 2bd9f9b)

Co-authored-by: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Co-authored-by: Victor Stinner <vstinner@python.org>
Co-authored-by: Gregory P. Smith <greg@krypto.org>
@bedevere-app
Copy link

bedevere-app bot commented Feb 13, 2025

GH-130075 is a backport of this pull request to the 3.9 branch.

@bedevere-app bedevere-app bot removed the needs backport to 3.9 only security fixes label Feb 13, 2025
ambv pushed a commit that referenced this pull request Feb 19, 2025
…9440) (#130075)

Fix ThreadedVSOCKSocketStreamTest: if get_cid() returns the host
address or the "any" address, use the local communication address
(loopback): VMADDR_CID_LOCAL.

On Linux 6.9, apparently, the /dev/vsock device is now available but
get_cid() returns VMADDR_CID_ANY (-1).

(cherry picked from commit 45db419)
(cherry picked from commit e94dbe4)
(cherry picked from commit c750061)
(cherry picked from commit cbfe302)

---

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 2bd9f9b)

Co-authored-by: Victor Stinner <vstinner@python.org>
Co-authored-by: Gregory P. Smith <greg@krypto.org>
Co-authored-by: Petr Viktorin <encukou@gmail.com>
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.

6 participants