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.

Sign up for GitHub

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

Jump to bottom

gh-122133: Rework pure Python socketpair tests to avoid use of importlib.reload. #122493

Merged

Yhg1s merged 2 commits into python:main from freakboy3742:socket-noreload

Jul 31, 2024

Contributor

freakboy3742 commented Jul 31, 2024 •

edited by bedevere-app bot

Loading

#122134 introduced a small change to the operation of the pure-Python socket.socketpair() method, and added a test for that method. However, the test used importlib.reload, which is problematic because there are methods that include import-time binding of symbols like _GLOBAL_DEFAULT_TIMEOUT as default arguments.

This manifested as test failures and a test lockup on iOS, but it would likely be possible to manifest similar problems on other platforms.

This PR modifies the socket module so that the pure Python fallback method is always defined, and is monkey patched into place for the pure python test, rather than performing a module reload.

Tagged for backport to all releases back to 3.8 because #122134 was back ported to all releases.

Issue: Pure-Python implementation of socket.socketpair() doesn't authenticate connected socket #122133


          Rework pure Python socketpair tests to avoid use of importlib.reload.

02112a0

freakboy3742 added skip news needs backport to 3.8 needs backport to 3.9 needs backport to 3.10 needs backport to 3.11 needs backport to 3.12 needs backport to 3.13 labels

freakboy3742 requested review from gpshead and sethmlarson

July 31, 2024 03:31

bedevere-app bot mentioned this pull request

Pure-Python implementation of socket.socketpair() doesn't authenticate connected socket #122133

Closed

bedevere-app bot added the awaiting core review label

Contributor Author

freakboy3742 commented Jul 31, 2024

!buildbot iOS

bedevere-bot commented Jul 31, 2024

🤖 New build scheduled with the buildbot fleet by @freakboy3742 for commit 02112a0 🤖

The command will test the builders whose names match following regular expression: iOS

The builders matched are:

iOS ARM64 Simulator PR


          Fix indentation on the continued str line.

b1b7823

gpshead approved these changes

View reviewed changes

bedevere-app bot added awaiting merge and removed awaiting core review labels

gpshead added the 🔨 test-with-buildbots label

bedevere-bot commented Jul 31, 2024

🤖 New build scheduled with the buildbot fleet by @gpshead for commit b1b7823 🤖

If you want to schedule another build, you need to add the 🔨 test-with-buildbots label again.

bedevere-bot removed the 🔨 test-with-buildbots label

Yhg1s merged commit f071f01 into python:main

80 of 86 checks passed

miss-islington-app bot commented Jul 31, 2024

Thanks @freakboy3742 for the PR, and @Yhg1s for merging it 🌮🎉.. I'm working now to backport this PR to: 3.8, 3.9, 3.10, 3.11, 3.12, 3.13.
🐍🍒⛏🤖

bedevere-app bot removed the awaiting merge label

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request


          pythongh-122133: Rework pure Python socketpair tests to avoid use of …

3c2d9c6

…importlib.reload. (pythonGH-122493)

(cherry picked from commit f071f01)

Co-authored-by: Russell Keith-Magee <russell@keith-magee.com>
Co-authored-by: Gregory P. Smith <greg@krypto.org>

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request


          pythongh-122133: Rework pure Python socketpair tests to avoid use of …

3f4f577

…importlib.reload. (pythonGH-122493)

(cherry picked from commit f071f01)

Co-authored-by: Russell Keith-Magee <russell@keith-magee.com>
Co-authored-by: Gregory P. Smith <greg@krypto.org>

bedevere-app bot commented Jul 31, 2024

GH-122504 is a backport of this pull request to the 3.13 branch.

bedevere-app bot removed the needs backport to 3.13 label

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request


          pythongh-122133: Rework pure Python socketpair tests to avoid use of …

c9e5b67

…importlib.reload. (pythonGH-122493)

(cherry picked from commit f071f01)

Co-authored-by: Russell Keith-Magee <russell@keith-magee.com>
Co-authored-by: Gregory P. Smith <greg@krypto.org>

bedevere-app bot commented Jul 31, 2024

GH-122505 is a backport of this pull request to the 3.12 branch.

bedevere-app bot removed the needs backport to 3.12 label

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request


          pythongh-122133: Rework pure Python socketpair tests to avoid use of …

0d54900

…importlib.reload. (pythonGH-122493)

(cherry picked from commit f071f01)

Co-authored-by: Russell Keith-Magee <russell@keith-magee.com>
Co-authored-by: Gregory P. Smith <greg@krypto.org>

bedevere-app bot commented Jul 31, 2024

GH-122506 is a backport of this pull request to the 3.11 branch.

bedevere-app bot removed the needs backport to 3.11 label

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request


          pythongh-122133: Rework pure Python socketpair tests to avoid use of …

312495b

…importlib.reload. (pythonGH-122493)

(cherry picked from commit f071f01)

Co-authored-by: Russell Keith-Magee <russell@keith-magee.com>
Co-authored-by: Gregory P. Smith <greg@krypto.org>

bedevere-app bot commented Jul 31, 2024

GH-122507 is a backport of this pull request to the 3.10 branch.

bedevere-app bot removed the needs backport to 3.10 label

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request


          pythongh-122133: Rework pure Python socketpair tests to avoid use of …

6f9ff6b

…importlib.reload. (pythonGH-122493)

(cherry picked from commit f071f01)

Co-authored-by: Russell Keith-Magee <russell@keith-magee.com>
Co-authored-by: Gregory P. Smith <greg@krypto.org>

bedevere-app bot commented Jul 31, 2024

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

bedevere-app bot removed the needs backport to 3.9 label

bedevere-app bot commented Jul 31, 2024

GH-122509 is a backport of this pull request to the 3.8 branch.

bedevere-app bot removed the needs backport to 3.8 label

Yhg1s pushed a commit that referenced this pull request


          [3.13] gh-122133: Rework pure Python socketpair tests to avoid use of…

c21a361

… importlib.reload. (GH-122493) (#122504)

gh-122133: Rework pure Python socketpair tests to avoid use of importlib.reload. (GH-122493)

(cherry picked from commit f071f01)

Co-authored-by: Russell Keith-Magee <russell@keith-magee.com>
Co-authored-by: Gregory P. Smith <greg@krypto.org>

mhsmith mentioned this pull request

gh-122133: Authenticate socket connection for socket.socketpair() fallback #122134

Merged

gpshead added a commit that referenced this pull request


          [3.12] gh-122133: Rework pure Python socketpair tests to avoid use of…

5df322e

… importlib.reload. (GH-122493) (GH-122505)

gh-122133: Rework pure Python socketpair tests to avoid use of importlib.reload. (GH-122493)

(cherry picked from commit f071f01)

Co-authored-by: Russell Keith-Magee <russell@keith-magee.com>
Co-authored-by: Gregory P. Smith <greg@krypto.org>

freakboy3742 deleted the socket-noreload branch

July 31, 2024 21:41

ambv pushed a commit that referenced this pull request


          [3.11] gh-122133: Rework pure Python socketpair tests to avoid use of…

c5655aa

… importlib.reload. (GH-122493) (GH-122506)

(cherry picked from commit f071f01)

Co-authored-by: Russell Keith-Magee <russell@keith-magee.com>
Co-authored-by: Gregory P. Smith <greg@krypto.org>

ambv pushed a commit that referenced this pull request


          [3.10] gh-122133: Rework pure Python socketpair tests to avoid use of…

31302f5

… importlib.reload. (GH-122493) (GH-122507)

(cherry picked from commit f071f01)

Co-authored-by: Russell Keith-Magee <russell@keith-magee.com>
Co-authored-by: Gregory P. Smith <greg@krypto.org>

ambv pushed a commit that referenced this pull request


          [3.9] gh-122133: Rework pure Python socketpair tests to avoid use of …

3f5d9d1

…importlib.reload. (GH-122493) (GH-122508)

(cherry picked from commit f071f01)

Co-authored-by: Russell Keith-Magee <russell@keith-magee.com>
Co-authored-by: Gregory P. Smith <greg@krypto.org>

ambv pushed a commit that referenced this pull request


          [3.8] gh-122133: Rework pure Python socketpair tests to avoid use of …

e319f77

…importlib.reload. (GH-122493) (GH-122509)

(cherry picked from commit f071f01)

Co-authored-by: Russell Keith-Magee <russell@keith-magee.com>
Co-authored-by: Gregory P. Smith <greg@krypto.org>

blhsing pushed a commit to blhsing/cpython that referenced this pull request


          pythongh-122133: Rework pure Python socketpair tests to avoid use of …

23ed3cf

…importlib.reload. (python#122493)


Co-authored-by: Gregory P. Smith <greg@krypto.org>

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels