foster/denoland-deno
1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2025-01-22 15:10:44 -05:00
Code Issues Packages 1 Wiki Activity

fix(watch): fix flaky tests for watcher (#8508)

Browse source
This commit is contained in:
Bartek Iwańczuk 2020-11-26 20:12:26 +01:00 • committed by GitHub
parent 8486b081ae
commit e84704968e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
cli/tests/integration_tests.rs
View file

@ -474,6 +474,19 @@ fn fmt_test() {
assert_eq!(expected, actual); assert_eq!(expected, actual);
} }
// Helper function to skip watcher output that contains "Restarting"
// phrase.
fn skip_restarting_line(
mut stderr_lines: impl Iterator<Item = String>,
) -> String {
loop {
let msg = stderr_lines.next().unwrap();
if !msg.contains("Restarting") {
return msg;
}
}
}
#[test] #[test]
fn fmt_watch_test() { fn fmt_watch_test() {
let t = TempDir::new().expect("tempdir fail"); let t = TempDir::new().expect("tempdir fail");
@ -495,13 +508,13 @@ fn fmt_watch_test() {
.spawn() .spawn()
.expect("Failed to spawn script"); .expect("Failed to spawn script");
let stderr = child.stderr.as_mut().unwrap(); let stderr = child.stderr.as_mut().unwrap();
let mut stderr_lines = let stderr_lines =
std::io::BufReader::new(stderr).lines().map(|r| r.unwrap()); std::io::BufReader::new(stderr).lines().map(|r| r.unwrap());
// TODO(lucacasonato): remove this timeout. It seems to be needed on Linux. // TODO(lucacasonato): remove this timeout. It seems to be needed on Linux.
std::thread::sleep(std::time::Duration::from_secs(1)); std::thread::sleep(std::time::Duration::from_secs(1));
assert!(stderr_lines.next().unwrap().contains("badly_formatted.js")); assert!(skip_restarting_line(stderr_lines).contains("badly_formatted.js"));
let expected = std::fs::read_to_string(fixed.clone()).unwrap(); let expected = std::fs::read_to_string(fixed.clone()).unwrap();
let actual = std::fs::read_to_string(badly_formatted.clone()).unwrap(); let actual = std::fs::read_to_string(badly_formatted.clone()).unwrap();