From 2e0ba67704f4260b9c1c87735868fc570ca6ce31 Mon Sep 17 00:00:00 2001 From: Matt Brubeck Date: Fri, 12 Sep 2014 21:49:35 -0700 Subject: [PATCH] Try to fix intermittent test failures Travis is showing intermittent failures in `test_cargo_compile_path_deps::path_dep_build_cmd` and `test_cargo_compile_git_deps::git_dep_build_cmd` (added in #561 and #563). I haven't managed to reproduce these failures locally, but I suspect the tests are timing-sensitive. This tries to guarantee that the timestamps during the two operations can't be the same. --- tests/test_cargo_compile_git_deps.rs | 2 ++ tests/test_cargo_compile_path_deps.rs | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/tests/test_cargo_compile_git_deps.rs b/tests/test_cargo_compile_git_deps.rs index 9eb6a6912..c50a255d6 100644 --- a/tests/test_cargo_compile_git_deps.rs +++ b/tests/test_cargo_compile_git_deps.rs @@ -1181,6 +1181,8 @@ test!(git_dep_build_cmd { "#) }).assert(); + p.root().join("bar").move_into_the_past().assert(); + assert_that(p.process(cargo_dir().join("cargo")).arg("build"), execs().with_status(0)); diff --git a/tests/test_cargo_compile_path_deps.rs b/tests/test_cargo_compile_path_deps.rs index 18be3e75a..c96e3dcf3 100644 --- a/tests/test_cargo_compile_path_deps.rs +++ b/tests/test_cargo_compile_path_deps.rs @@ -667,7 +667,10 @@ test!(path_dep_build_cmd { pub fn gimme() -> int { 0 } "#); - assert_that(p.cargo_process("build"), + p.build(); + p.root().join("bar").move_into_the_past().assert(); + + assert_that(p.process(cargo_dir().join("cargo")).arg("build"), execs().with_stdout(format!("{} bar v0.5.0 ({})\n\ {} foo v0.5.0 ({})\n", COMPILING, p.url(),