Skip to content

cargotest: Fix with_*_does_not_contain to support [..] and macro matching. #5392

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

Merged
merged 1 commit into from
Apr 19, 2018
Merged

cargotest: Fix with_*_does_not_contain to support [..] and macro matching. #5392

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion tests/testsuite/bench.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ fn bench_multiple_targets() {
.with_status(0)
.with_stdout_contains("test run1 ... bench: [..]")
.with_stdout_contains("test run2 ... bench: [..]")
.with_stdout_does_not_contain("run3"),
.with_stdout_does_not_contain("[..]run3[..]"),
);
}

Expand Down
2 changes: 1 addition & 1 deletion tests/testsuite/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4509,7 +4509,7 @@ fn build_virtual_manifest_one_project() {
p.cargo("build").arg("-p").arg("foo"),
execs()
.with_status(0)
.with_stderr_does_not_contain("bar")
.with_stderr_does_not_contain("[..]bar[..]")
.with_stderr_contains("[..] Compiling foo v0.1.0 ([..])")
.with_stderr(
"[..] Compiling [..] v0.1.0 ([..])\n\
Expand Down
16 changes: 13 additions & 3 deletions tests/testsuite/cargotest/support/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -687,16 +687,26 @@ impl Execs {
}
}
MatchKind::NotPresent => {
if !actual.contains(out) {
Ok(())
} else {
let mut a = actual.lines();
let e = out.lines();

let mut diffs = self.diff_lines(a.clone(), e.clone(), true);
while let Some(..) = a.next() {
let a = self.diff_lines(a.clone(), e.clone(), true);
if a.len() < diffs.len() {
diffs = a;
}
}
if diffs.is_empty() {
Err(format!(
"expected not to find:\n\
{}\n\n\
but found in output:\n\
{}",
out, actual
))
} else {
Ok(())
}
}
}
Expand Down
24 changes: 12 additions & 12 deletions tests/testsuite/check.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -743,10 +743,10 @@ fn check_filters() {
.with_status(0)
.with_stderr_contains("[..]unused_normal_lib[..]")
.with_stderr_contains("[..]unused_normal_bin[..]")
.with_stderr_does_not_contain("unused_normal_t1")
.with_stderr_does_not_contain("unused_normal_ex1")
.with_stderr_does_not_contain("unused_normal_b1")
.with_stderr_does_not_contain("unused_unit_"),
.with_stderr_does_not_contain("[..]unused_normal_t1[..]")
.with_stderr_does_not_contain("[..]unused_normal_ex1[..]")
.with_stderr_does_not_contain("[..]unused_normal_b1[..]")
.with_stderr_does_not_contain("[..]unused_unit_[..]"),
);
p.root().join("target").rm_rf();
assert_that(
Expand All @@ -764,8 +764,8 @@ fn check_filters() {
.with_stderr_contains("[..]unused_unit_t1[..]")
.with_stderr_contains("[..]unused_normal_ex1[..]")
.with_stderr_contains("[..]unused_unit_ex1[..]")
.with_stderr_does_not_contain("unused_normal_b1")
.with_stderr_does_not_contain("unused_unit_b1"),
.with_stderr_does_not_contain("[..]unused_normal_b1[..]")
.with_stderr_does_not_contain("[..]unused_unit_b1[..]"),
);
p.root().join("target").rm_rf();
assert_that(
Expand All @@ -775,12 +775,12 @@ fn check_filters() {
.with_stderr_contains("[..]unused_normal_lib[..]")
.with_stderr_contains("[..]unused_normal_bin[..]")
.with_stderr_contains("[..]unused_unit_t1[..]")
.with_stderr_does_not_contain("unused_unit_lib")
.with_stderr_does_not_contain("unused_unit_bin")
.with_stderr_does_not_contain("unused_normal_ex1")
.with_stderr_does_not_contain("unused_normal_b1")
.with_stderr_does_not_contain("unused_unit_ex1")
.with_stderr_does_not_contain("unused_unit_b1"),
.with_stderr_does_not_contain("[..]unused_unit_lib[..]")
.with_stderr_does_not_contain("[..]unused_unit_bin[..]")
.with_stderr_does_not_contain("[..]unused_normal_ex1[..]")
.with_stderr_does_not_contain("[..]unused_normal_b1[..]")
.with_stderr_does_not_contain("[..]unused_unit_ex1[..]")
.with_stderr_does_not_contain("[..]unused_unit_b1[..]"),
);
p.root().join("target").rm_rf();
assert_that(
Expand Down