Skip to content

Commit

Permalink
Auto merge of #2496 - alexcrichton:fix-concurrent, r=alexcrichton
Browse files Browse the repository at this point in the history
Relax an assertion in the concurrent tests

The output may also have information about blocking, we just want the successful
part.
  • Loading branch information
bors committed Mar 18, 2016
2 parents fe24df2 + 2b9bbba commit 018dc95
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion tests/test_cargo_concurrent.rs
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ test!(one_install_should_be_bad {
assert_that(bad, execs().with_status(101).with_stderr_contains(&format!("\
{error} binary `foo[..]` already exists in destination as part of `[..]`
", error = ERROR)));
assert_that(good, execs().with_status(0).with_stderr("\
assert_that(good, execs().with_status(0).with_stderr_contains("\
warning: be sure to add `[..]` to your PATH [..]
"));

Expand Down

0 comments on commit 018dc95

Please sign in to comment.