Skip to content

Conversation

@vstinner
Copy link
Member

@vstinnervstinner commented Sep 22, 2023

…08401) Convert test_concurrent_futures to a package of sub-tests. (cherry picked from commit aa6f787)
* AsCompletedTests: Revert test_future_times_out() => test_zero_timeout() * Restore TODO comment * ThreadPoolExecutorTest.test_hang_global_shutdown_lock(): add @support.requires_resource('cpu').
@vstinner
Copy link
MemberAuthor

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
MemberAuthor

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

@vstinnervstinner enabled auto-merge (squash) September 22, 2023 01:14
@vstinnervstinner merged commit 66a973a into python:3.11Sep 22, 2023
@vstinnervstinner deleted the test_concurrent_package311 branch September 22, 2023 01:37
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant

@vstinner