Skip to content

Commit 034ddb6

Browse files
committed
Remove forced timeout in tests
1 parent 0075368 commit 034ddb6

File tree

3 files changed

+1
-21
lines changed

3 files changed

+1
-21
lines changed

Cargo.lock

Lines changed: 0 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/runner/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ uefi = ["bootloader/uefi"]
1414
[dependencies]
1515
bootloader = { path = "../..", default-features = false }
1616
strip-ansi-escapes = "0.1.1"
17-
wait-timeout = "0.2.0"
1817
anyhow = "1.0.89"
1918
ureq = "2.10.1"
2019
fs-err = "2.11.0"

tests/runner/src/lib.rs

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -117,11 +117,8 @@ where
117117
use std::{
118118
io::Read,
119119
process::{Command, Stdio},
120-
time::Duration,
121120
};
122121

123-
use wait_timeout::ChildExt;
124-
125122
const QEMU_ARGS: &[&str] = &[
126123
"-device",
127124
"isa-debug-exit,iobase=0xf4,iosize=0x04",
@@ -165,13 +162,7 @@ where
165162
)
166163
});
167164

168-
let Some(exit_status) = child.wait_timeout(Duration::new(120, 0)).unwrap() else {
169-
child
170-
.kill()
171-
.expect("Qemu could not be killed after timeout");
172-
panic!("Test timed out after 2 minutes");
173-
};
174-
match exit_status.code() {
165+
match child.wait().unwrap().code() {
175166
Some(33) => {} // success
176167
Some(35) => panic!("Test failed"),
177168
other => panic!("Test failed with unexpected exit code `{other:?}`"),

0 commit comments

Comments
 (0)