NotificationsYou must be signed in to change notification settings
Fork33.7k
Star70.4k

gh-99645: Fix a bug in handling class cleanups in unittest.TestCase#99646

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 ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Jump to bottom

Merged

serhiy-storchaka merged 2 commits intopython:mainfromserhiy-storchaka:unittest-class-cleanup

Nov 22, 2022

Merged

gh-99645: Fix a bug in handling class cleanups in unittest.TestCase#99646

serhiy-storchaka merged 2 commits intopython:mainfromserhiy-storchaka:unittest-class-cleanup

Nov 22, 2022

Conversation

Copy link

Member

serhiy-storchaka commentedNov 21, 2022•
edited by bedevere-bot
Loading

Now addClassCleanup() uses separate lists for different TestCase subclasses, and doClassCleanups() only cleans up the particular class.

Issue:All TestCase classes use a shared stack for class cleanup #99645

pythongh-99645: Fix a bug in handling class cleanups in unittest.Test…

c144e5f

…CaseNow addClassCleanup() uses separate lists for different TestCase subclasses,and doClassCleanups() only cleans up the particular class.

serhiy-storchaka added needs backport to 3.10

only security fixes

needs backport to 3.11only security fixes labels

Nov 21, 2022

bedevere-bot mentioned this pull request

Nov 21, 2022

All TestCase classes use a shared stack for class cleanup#99645

Closed

bedevere-bot added the awaiting core review label

Nov 21, 2022

ronaldoussoren reviewed

Nov 22, 2022

View reviewed changes

Copy link

Contributor

ronaldoussoren left a comment

Choose a reason for hiding this comment

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

Other than the two minor comments mentioned inline the PR looks OK.

Lib/test/test_unittest/test_runner.py Outdated

		'end test1','cleanup1'])


		deftest_debug_nested_test(self):

Copy link

Contributor

Choose a reason for hiding this comment

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

This test appears to test nothing.

Lib/test/test_unittest/test_runner.py Outdated

		classInnerTest(unittest.TestCase):
		@classmethod
		defsetUpClass(cls):
		ordering.append('setUpClass2')

Copy link

Contributor

Choose a reason for hiding this comment

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

It might be clearer to change the string to "setup inner" (and likewise for the other numbered strings), that makes it clearer what the expected ordering is.

Address review comments.

7819ed6

serhiy-storchaka merged commitc210213 intopython:main

Nov 22, 2022

serhiy-storchaka deleted the unittest-class-cleanup branch

November 22, 2022 15:49

serhiy-storchaka added needs backport to 3.11only security fixes and removed needs backport to 3.11only security fixes labels

Nov 22, 2022

Copy link

Contributor

miss-islington commentedNov 22, 2022

Thanks@serhiy-storchaka for the PR 🌮🎉.. I'm working now to backport this PR to: 3.11.
🐍🍒⛏🤖 I'm not a witch! I'm not a witch!

Copy link

Contributor

miss-islington commentedNov 22, 2022

Sorry@serhiy-storchaka, I had trouble checking out the3.11 backport branch.
Please retry by removing and re-adding the "needs backport to 3.11" label.
Alternatively, you can backport usingcherry_picker on the command line.
cherry_picker c2102136be569e6fc8ed90181f229b46d07142f8 3.11

miss-islington assignedserhiy-storchaka

Nov 22, 2022

serhiy-storchaka added needs backport to 3.10

only security fixes

needs backport to 3.11only security fixes and removed needs backport to 3.10

only security fixes

needs backport to 3.11only security fixes labels

Nov 22, 2022

Copy link

Contributor

miss-islington commentedNov 22, 2022

Thanks@serhiy-storchaka for the PR 🌮🎉.. I'm working now to backport this PR to: 3.10.
🐍🍒⛏🤖

Copy link

Contributor

miss-islington commentedNov 22, 2022

Thanks@serhiy-storchaka for the PR 🌮🎉.. I'm working now to backport this PR to: 3.11.
🐍🍒⛏🤖

Copy link

Contributor

miss-islington commentedNov 22, 2022

Sorry,@serhiy-storchaka, I could not cleanly backport this to3.10 due to a conflict.
Please backport usingcherry_picker on command line.
cherry_picker c2102136be569e6fc8ed90181f229b46d07142f8 3.10

Copy link

Contributor

miss-islington commentedNov 22, 2022

serhiy-storchaka added a commit to serhiy-storchaka/cpython that referenced this pull request

Nov 22, 2022

[3.11]pythongh-99645: Fix a bug in handling class cleanups in unitte…

c44b8c2

…st.TestCase (pythonGH-99646)Now addClassCleanup() uses separate lists for different TestCase subclasses,and doClassCleanups() only cleans up the particular class.(cherry picked from commitc210213)Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>

serhiy-storchaka added a commit to serhiy-storchaka/cpython that referenced this pull request

Nov 22, 2022

[3.11]pythongh-99645: Fix a bug in handling class cleanups in unitte…

9219f7a

…st.TestCase (pythonGH-99646)Now addClassCleanup() uses separate lists for different TestCase subclasses,and doClassCleanups() only cleans up the particular class.(cherry picked from commitc210213)Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>

Copy link

bedevere-bot commentedNov 22, 2022

GH-99698 is a backport of this pull request to the3.11 branch.

bedevere-bot removed the needs backport to 3.11only security fixes label

Nov 22, 2022

serhiy-storchaka added a commit to serhiy-storchaka/cpython that referenced this pull request

Nov 22, 2022

[3.10]pythongh-99645: Fix a bug in handling class cleanups in unitte…

4c3f9d8

…st.TestCase (pythonGH-99646)Now addClassCleanup() uses separate lists for different TestCase subclasses,and doClassCleanups() only cleans up the particular class..(cherry picked from commitc210213)Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>

Copy link

bedevere-bot commentedNov 22, 2022

GH-99699 is a backport of this pull request to the3.10 branch.

bedevere-bot removed the needs backport to 3.10only security fixes label

Nov 22, 2022

serhiy-storchaka removed their assignment

Nov 22, 2022

serhiy-storchaka added a commit that referenced this pull request

Nov 22, 2022

[3.11]gh-99645: Fix a bug in handling class cleanups in unittest.Tes…

9a7899b

…tCase (GH-99646) (GH-99698)Now addClassCleanup() uses separate lists for different TestCase subclasses,and doClassCleanups() only cleans up the particular class.(cherry picked from commitc210213)

serhiy-storchaka added a commit that referenced this pull request

Nov 22, 2022

[3.10]gh-99645: Fix a bug in handling class cleanups in unittest.Tes…

400d41b

…tCase (GH-99646) (GH-99699)Now addClassCleanup() uses separate lists for different TestCase subclasses,and doClassCleanups() only cleans up the particular class.(cherry picked from commitc210213)