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.

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

fix close_read_wakes_up test #122095

Merged
merged 1 commit into from
Mar 9, 2024
Merged

Conversation

lukas-code
Copy link
Member

@lukas-code lukas-code commented Mar 6, 2024

On windows, shutdown does not interrupt read, even though we document that it does (see #121594).

The close_read_wakes_up test has a race condition and only passes on windows if the shutdown happens before the read. This PR ignores the test on windows adds a sleep to make it more likely that the read happens before the shutdown and the test actually tests what it is supposed to test on other platforms.

I'm submitting this before any docs changes, so that we can find out on what platforms shutdown actually works as documented.

r? @ChrisDenton

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-libs Relevant to the library team, which will review and decide on the PR/issue. labels Mar 6, 2024
@ChrisDenton
Copy link
Member

I do strongly disagree with my past self for enabling this test. As I recall at the time, there were a number of tests that were simply disabled on Windows instead of fixing the bug that caused the failure and when bugs were fixed, tests weren't re-enabled. It seems I was a bit, let's say "over enthusiastic", about re-enabling tests.

In any case, let's see what CI has to say.

@bors r+ rollup=iffy

@bors
Copy link
Collaborator

bors commented Mar 6, 2024

📌 Commit 9abe47e has been approved by ChrisDenton

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 6, 2024
@bors
Copy link
Collaborator

bors commented Mar 9, 2024

⌛ Testing commit 9abe47e with merge 48a15aa...

@bors
Copy link
Collaborator

bors commented Mar 9, 2024

☀️ Test successful - checks-actions
Approved by: ChrisDenton
Pushing 48a15aa to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 9, 2024
@bors bors merged commit 48a15aa into rust-lang:master Mar 9, 2024
12 checks passed
@rustbot rustbot added this to the 1.78.0 milestone Mar 9, 2024
@lukas-code lukas-code deleted the windows-shutdown-test branch March 9, 2024 11:09
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (48a15aa): comparison URL.

Overall result: ❌ regressions - no action needed

@rustbot label: -perf-regression

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
0.2% [0.2%, 0.2%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) - - 0

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-3.8% [-5.3%, -2.2%] 2
All ❌✅ (primary) - - 0

Cycles

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-2.2% [-2.2%, -2.2%] 1
All ❌✅ (primary) - - 0

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 650.027s -> 650.646s (0.10%)
Artifact size: 172.57 MiB -> 172.57 MiB (0.00%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-libs Relevant to the library team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants