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

Revert "fix: add a hack to prevent flaky test from blocking others" #6011

Closed
wants to merge 1 commit into from
Closed

Revert "fix: add a hack to prevent flaky test from blocking others" #6011

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions crates/turborepo-lib/src/process/child.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
/// channel when the child process exits.
async fn process(&self, child: &mut tokio::process::Child) -> ChildState {
match self {
ShutdownStyle::Graceful(timeout) => {

Check warning on line 85 in crates/turborepo-lib/src/process/child.rs

View workflow job for this annotation

GitHub Actions / Build Turborepo (windows, windows-latest) 

unused variable: `timeout`

Check warning on line 85 in crates/turborepo-lib/src/process/child.rs

View workflow job for this annotation

GitHub Actions / Turborepo E2E Tests (windows, windows-latest) 

unused variable: `timeout`
// try ro run the command for the given timeout
#[cfg(unix)]
{
Expand Down Expand Up @@ -497,12 +497,7 @@
let state = child.state.read().await;

// this should time out and be killed
assert_matches!(
&*state,
// todo(arlyon): on ubuntu the detection logic between killed and gracefully terminated
// is flaky
ChildState::Exited(ChildExit::Killed) | ChildState::Exited(ChildExit::Finished(None))
);
assert_matches!(&*state, ChildState::Exited(ChildExit::Killed));
}

#[tokio::test]
Expand Down
Loading