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.

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

[3.11] gh-108388: Convert test_concurrent_futures to package (#108401) #109704

Merged
merged 2 commits into from
Sep 22, 2023
Merged

[3.11] gh-108388: Convert test_concurrent_futures to package (#108401) #109704

merged 2 commits into from
Sep 22, 2023

Conversation

vstinner
Copy link
Member

@vstinner vstinner commented Sep 22, 2023 •
edited by bedevere-app bot
Loading

@vstinner
pythongh-108388: Convert test_concurrent_futures to package (python#1…
b3574d8 
…08401)

Convert test_concurrent_futures to a package of sub-tests.

(cherry picked from commit aa6f787)
@vstinner
Fix the backport
0b7d750 
* AsCompletedTests: Revert test_future_times_out() => test_zero_timeout()
* Restore TODO comment
* ThreadPoolExecutorTest.test_hang_global_shutdown_lock():
  add @support.requires_resource('cpu').
@bedevere-app bedevere-app bot mentioned this pull request Sep 21, 2023
Closed
@bedevere-app bedevere-app bot mentioned this pull request Sep 22, 2023
Merged
@vstinner
Copy link
Member Author

Backporting PR #108401 to 3.11 branch was challenging.

I used git cherry-pick -x, fixed conflicts, and then I "undone" manually the change by moving code again into as single Lib/test/test_concurrent_futures.py to compare changes, and I compared code before/after using meld.

I found a few minor differences, the second commit of this PR:

  • AsCompletedTests: Revert test_future_times_out() => test_zero_timeout()
  • Restore TODO comment
  • ThreadPoolExecutorTest.test_hang_global_shutdown_lock(): add @support.requires_resource('cpu').

I also compared the new test_concurrent_futures/ directory in 3.11 and main branches. There are only minor differences. Some minor changes no backported to 3.11.

@vstinner
Copy link
Member Author

Once this change is merged, I will be able to backport #109703 to 3.11.

@vstinner vstinner enabled auto-merge (squash) September 22, 2023 01:14
@vstinner vstinner merged commit 66a973a into python:3.11 Sep 22, 2023
22 of 23 checks passed
@vstinner vstinner deleted the test_concurrent_package311 branch September 22, 2023 01:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
skip news
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@vstinner