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

[3.11] gh-108388: Convert test_concurrent_futures to package (#108401) by vstinner · Pull Request #109704 · python/cpython · GitHub

/ cpython Public

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

Merged
vstinner merged 2 commits into
python:3.11from
vstinner:test_concurrent_package311
Sep 22, 2023
Merged

[3.11] gh-108388: Convert test_concurrent_futures to package (#108401)#109704
vstinner merged 2 commits into
python:3.11from
vstinner:test_concurrent_package311

Conversation

vstinner commented Sep 22, 2023
edited by bedevere-app Bot
Loading

Copy link
Copy Markdown
Member

…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').

Copy link
Copy Markdown
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.

Copy link
Copy Markdown
Member Author

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

vstinner enabled auto-merge (squash) September 22, 2023 01:14
vstinner merged commit 66a973a into python:3.11 Sep 22, 2023
vstinner deleted the test_concurrent_package311 branch September 22, 2023 01:37
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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant


Back | FazBrowse Home | New Git URL