bpo-46198: rename duplicate tests and remove unused code #30297

sobolevn · 2021-12-30T00:26:30Z

Right now, two tests have the same name:

cpython/Lib/test/test_email/test__header_value_parser.py

Line 304 in 8e11237

def test_get_unstructured_invalid_ew(self):
cpython/Lib/test/test_email/test__header_value_parser.py

Line 398 in 8e11237

def test_get_unstructured_invalid_ew(self):

The first one is always skipped.
I think that NEWS should not be added.

https://bugs.python.org/issue46198

sobolevn · 2021-12-30T00:48:07Z

test_asyncio is still failing sometimes on Windows 🤔

sobolevn · 2022-01-01T09:30:23Z

I am addressing feedback from https://bugs.python.org/issue46198, so I am increasing the scope of this PR to also include other similar cases. I am using flake8 with --select=F811 to find duplicates.

Amount of tests:

test_enum: 232 -> 236
test__header_value_parser.py: 1659 -> 1660
test_dict: 108 -> 109
test_compile: 101 -> 102
test_typing: 407 -> 408

AlexWaygood · 2022-01-01T09:45:14Z

Title of the PR needs to change!

Lib/test/test_enum.py

sobolevn · 2022-01-18T12:09:27Z

Rebased to solve merge conflicts in test_enum (it is going through a major refactoring).

sobolevn · 2022-01-26T09:46:34Z

Rebased to solve conflicts in test_typing.

merwok · 2022-01-26T15:58:27Z

In general, please do merges for CPython rather than rebases and force pushes: https://devguide.python.org/pullrequest/
The reviewing experience on github is poor when there are force pushes.

merwok · 2022-01-30T21:28:37Z

@raghavthind2005 hello 👋🏽 Reviews by non-core developers are useful if you carefully consider the bug report, the changes, the discussions. Sometimes you need to get the branch locally, build python and try out the code to see if it does what it’s supposed to. It is useful if people who are not core devs do these things and write a message on the PR to say that. But just giving +1 without engaging with the process or the people has little value.

JelleZijlstra

Thanks, I'm planning to merge this (cc @gvanrossum).

The duplicate test cases are quite bad and we should definitely fix them. The duplicate imports aren't as bad but it's still cleaner to get them fixed.

gvanrossum · 2022-03-10T16:18:49Z

@JelleZijlstra Looks fine to me. (In general I think you don't have to CC me on things you plan to merge any more, unless you really want me to have another look. You're doing great!)

JelleZijlstra · 2022-03-10T16:19:49Z

Great, thanks! I was thinking of asking when I could leave new core dev quarantine :)

miss-islington · 2022-03-10T16:20:14Z

Thanks @sobolevn for the PR, and @JelleZijlstra for merging it 🌮🎉.. I'm working now to backport this PR to: 3.9, 3.10.
🐍🍒⛏🤖

miss-islington · 2022-03-10T16:20:17Z

Sorry @sobolevn and @JelleZijlstra, I had trouble checking out the 3.10 backport branch.
Please backport using cherry_picker on command line.
cherry_picker 6c83c8e6b56b57a8a794e7b6c07837be4ce3bb97 3.10

miss-islington · 2022-03-10T16:20:21Z

Sorry, @sobolevn and @JelleZijlstra, I could not cleanly backport this to 3.9 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker 6c83c8e6b56b57a8a794e7b6c07837be4ce3bb97 3.9

JelleZijlstra · 2022-03-10T16:20:50Z

I'll backport

…onGH-30297). (cherry picked from commit 6c83c8e) Co-authored-by: Nikita Sobolev <mail@sobolevn.me>

bedevere-bot · 2022-03-10T16:27:13Z

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

…nGH-30297). (cherry picked from commit 6c83c8e) Co-authored-by: Nikita Sobolev <mail@sobolevn.me>

JelleZijlstra · 2022-03-10T16:27:46Z

#31796 is the 3.10 backport, not sure why the bot didn't pick it up

pythonGH-30297 removed a duplicate `from test import support` statement from `test_asyncio.test_sslproto`. However, in between that PR being filed and it being merged, pythonGH-31275 removed the _other_ `from test import support` statement. This means that `support` is now undefined in `test_asyncio.test_sslproto`, causing the CI to fail on all platforms for all PRS.

) (GH-31797) (cherry picked from commit 6c83c8e) Co-authored-by: Nikita Sobolev <mail@sobolevn.me>

GH-30297 removed a duplicate `from test import support` statement from `test_asyncio.test_sslproto`. However, in between that PR being filed and it being merged, GH-31275 removed the _other_ `from test import support` statement. This means that `support` is now undefined in `test_asyncio.test_sslproto`, causing the CI to fail on all platforms for all PRS.

…0297) (GH-31796) (cherry picked from commit 6c83c8e) Co-authored-by: Nikita Sobolev <mail@sobolevn.me>

…nGH-30297) (pythonGH-31797) (cherry picked from commit 6c83c8e) Co-authored-by: Nikita Sobolev <mail@sobolevn.me>

sobolevn requested a review from a team as a code owner December 30, 2021 00:26

the-knights-who-say-ni added the CLA signed label Dec 30, 2021

bedevere-bot added tests Tests in the Lib/test dir awaiting review labels Dec 30, 2021

AlexWaygood added the skip news label Dec 30, 2021

sobolevn closed this Dec 30, 2021

sobolevn reopened this Dec 30, 2021

sobolevn closed this Dec 30, 2021

sobolevn reopened this Dec 30, 2021

AlexWaygood added needs backport to 3.9 only security fixes needs backport to 3.10 only security fixes labels Dec 30, 2021

AlexWaygood approved these changes Dec 30, 2021

View reviewed changes

bedevere-bot added awaiting core review and removed awaiting review labels Dec 30, 2021

sobolevn requested review from abalkin, ethanfurman, Fidget-Spinner, gvanrossum and pganssle as code owners January 1, 2022 09:30

sobolevn changed the title ~~bpo-46198: unskip one test in test_email~~ bpo-46198: rename duplicate tests and remove unused code Jan 1, 2022

merwok approved these changes Jan 1, 2022

View reviewed changes

bedevere-bot added awaiting merge and removed awaiting core review labels Jan 1, 2022

merwok reviewed Jan 2, 2022

View reviewed changes

Lib/test/test_enum.py Outdated Show resolved Hide resolved

Fidget-Spinner approved these changes Jan 4, 2022

View reviewed changes

merwok reviewed Jan 4, 2022

View reviewed changes

Lib/test/test_enum.py Outdated Show resolved Hide resolved

raghavthind2005 approved these changes Jan 18, 2022

View reviewed changes

Merge branch 'main' into issue-46198

bc5a8a2

JelleZijlstra approved these changes Mar 10, 2022

View reviewed changes

JelleZijlstra self-assigned this Mar 10, 2022

merwok approved these changes Mar 10, 2022

View reviewed changes

JelleZijlstra merged commit 6c83c8e into python:main Mar 10, 2022

bedevere-bot removed the awaiting merge label Mar 10, 2022

JelleZijlstra pushed a commit to JelleZijlstra/cpython that referenced this pull request Mar 10, 2022

[3.10] bpo-46198: rename duplicate tests and remove unused code (pyth…

c031cf4

…onGH-30297). (cherry picked from commit 6c83c8e) Co-authored-by: Nikita Sobolev <mail@sobolevn.me>

bedevere-bot removed the needs backport to 3.9 only security fixes label Mar 10, 2022

JelleZijlstra pushed a commit to JelleZijlstra/cpython that referenced this pull request Mar 10, 2022

[3.9] bpo-46198: rename duplicate tests and remove unused code (pytho…

766f920

…nGH-30297). (cherry picked from commit 6c83c8e) Co-authored-by: Nikita Sobolev <mail@sobolevn.me>

AlexWaygood mentioned this pull request Mar 10, 2022

bpo-46198: Fix test_asyncio.test_sslproto #31801

Merged

JelleZijlstra added a commit that referenced this pull request Mar 10, 2022

[3.9] bpo-46198: rename duplicate tests and remove unused code (GH-30297

f7f7838

) (GH-31797) (cherry picked from commit 6c83c8e) Co-authored-by: Nikita Sobolev <mail@sobolevn.me>

JelleZijlstra added a commit that referenced this pull request Mar 10, 2022

[3.10] bpo-46198: rename duplicate tests and remove unused code (GH-3…

4199b7f

…0297) (GH-31796) (cherry picked from commit 6c83c8e) Co-authored-by: Nikita Sobolev <mail@sobolevn.me>

hugovk mentioned this pull request Mar 15, 2022

Accessibility: Add aria-label to clearly describe the dark mode button python/peps#2426

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

bpo-46198: rename duplicate tests and remove unused code #30297

bpo-46198: rename duplicate tests and remove unused code #30297

sobolevn commented Dec 30, 2021 •

edited by bedevere-bot

Loading

sobolevn commented Dec 30, 2021

sobolevn commented Jan 1, 2022 •

edited

Loading

AlexWaygood commented Jan 1, 2022

sobolevn commented Jan 18, 2022

sobolevn commented Jan 26, 2022

merwok commented Jan 26, 2022

merwok commented Jan 30, 2022

JelleZijlstra left a comment

gvanrossum commented Mar 10, 2022

JelleZijlstra commented Mar 10, 2022

miss-islington commented Mar 10, 2022

miss-islington commented Mar 10, 2022

miss-islington commented Mar 10, 2022

JelleZijlstra commented Mar 10, 2022

bedevere-bot commented Mar 10, 2022

JelleZijlstra commented Mar 10, 2022

bpo-46198: rename duplicate tests and remove unused code #30297

bpo-46198: rename duplicate tests and remove unused code #30297

Conversation

sobolevn commented Dec 30, 2021 • edited by bedevere-bot Loading

sobolevn commented Dec 30, 2021

sobolevn commented Jan 1, 2022 • edited Loading

AlexWaygood commented Jan 1, 2022

sobolevn commented Jan 18, 2022

sobolevn commented Jan 26, 2022

merwok commented Jan 26, 2022

merwok commented Jan 30, 2022

JelleZijlstra left a comment

Choose a reason for hiding this comment

gvanrossum commented Mar 10, 2022

JelleZijlstra commented Mar 10, 2022

miss-islington commented Mar 10, 2022

miss-islington commented Mar 10, 2022

miss-islington commented Mar 10, 2022

JelleZijlstra commented Mar 10, 2022

bedevere-bot commented Mar 10, 2022

JelleZijlstra commented Mar 10, 2022

sobolevn commented Dec 30, 2021 •

edited by bedevere-bot

Loading

sobolevn commented Jan 1, 2022 •

edited

Loading