FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

[3.13] gh-117174: Adapt `test_multiple_statements_fail_early` to new REPL behavior (follow-up gh-131065) (GH-131836) by miss-islington · Pull Request #131841 · python/cpython · GitHub

/ cpython Public

[3.13] gh-117174: Adapt test_multiple_statements_fail_early to new REPL behavior (follow-up gh-131065) (GH-131836) - #131841

Merged
Yhg1s merged 2 commits into
python:3.13from
miss-islington:backport-a6cf827-3.13
Mar 28, 2025
Merged

[3.13] gh-117174: Adapt test_multiple_statements_fail_early to new REPL behavior (follow-up gh-131065) (GH-131836)#131841
Yhg1s merged 2 commits into
python:3.13from
miss-islington:backport-a6cf827-3.13

Conversation

Copy link
Copy Markdown
Contributor

Adapt test to new REPL behavior (follow-up gh-117174)
(cherry picked from commit a6cf827)

Co-authored-by: Bartosz Sławecki bartosz@ilikepython.com

…EPL behavior (follow-up pythongh-131065) (pythonGH-131836)

Adapt test to new REPL behavior (follow-up pythongh-117174)
(cherry picked from commit a6cf827)

Co-authored-by: Bartosz Sławecki <bartosz@ilikepython.com>

Yhg1s commented Mar 28, 2025

Copy link
Copy Markdown
Member

@bswck unfortunately it doesn't look like the fix in GH-131836 was enough to fix the failures in 3.13.

Copy link
Copy Markdown
Member

Looking at it

johnslavik commented Mar 28, 2025
edited
Loading

Copy link
Copy Markdown
Member

The error isn't relevant to this fix, but to the fix in gh-131065, which was not backported.
It must have been overlooked that the test does exist in 3.13. Backporting gh-131065 should solve this problem.
Hm, no, I got lost.

johnslavik commented Mar 28, 2025
edited
Loading

Copy link
Copy Markdown
Member

Oh, I see.

gh-129488 added two new tests to the main branch:

They started failing upon changes related to gh-117174, which is why Pablo created gh-131065, which was merged 3 weeks ago.

gh-129488 has been backported to 3.13 in gh-130513 very recently, readding these to the 3.13 branch:

Because the backport readded the latter test regardless of gh-131065, the buildbot reported failures for it.

The reason this still fails is because I assumed that gh-130513 had been merged long ago, so I thought that gh-131065 wouldn't have to be manually applied to 3.13. So instead, I fixed the first test, which had never been an issue, but the actual fix (gh-131065) was never applied to 3.13, because gh-130513 hadn't been merged back then.

The simplest way to get out of this situation is to cherry-pick gh-131065 to this PR.
It's not bad that gh-131836 was merged to main (just unnecessary?), but we also need to reapply gh-131065 here.

johnslavik commented Mar 28, 2025
edited
Loading

Copy link
Copy Markdown
Member

@Yhg1s I don't have permissions to write to backport branches. Could you please cherry-pick/reapply gh-131065 in this PR?

johnslavik commented Mar 28, 2025
edited
Loading

Copy link
Copy Markdown
Member

Ah, and the most important part: conclusions. Before merging an old PR, it's good to re-run CI on it after refreshing it. Will remember to do that with my PRs 🫡

Yhg1s commented Mar 28, 2025

Copy link
Copy Markdown
Member

GH-131850 is the backport of the other fix.

Yhg1s disabled auto-merge March 28, 2025 16:24
Yhg1s enabled auto-merge (squash) March 28, 2025 16:25
Yhg1s merged commit 3e45b1f into python:3.13 Mar 28, 2025

Yhg1s commented Mar 28, 2025

Copy link
Copy Markdown
Member

@bswck Thanks for sorting out the test failures :)

miss-islington deleted the backport-a6cf827-3.13 branch January 2, 2026 18:03
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
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


Back | FazBrowse Home | New Git URL