Skip to content

Commit e3fbe04

Browse files
committed
add tests for some TestResult comparisions and adjust matching accordingly
based on my comment at <#770 (comment)>
1 parent ea9d399 commit e3fbe04

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

src/report/mod.rs

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -517,10 +517,10 @@ fn compare(
517517
}
518518
}
519519

520-
(PrepareFail(_), _) | (_, PrepareFail(_)) => Comparison::PrepareFail,
521-
(Error, _) | (_, Error) => Comparison::Error,
522520
(Skipped, _) | (_, Skipped) => Comparison::Skipped,
523521
(BrokenCrate(_), _) | (_, BrokenCrate(_)) => Comparison::Broken,
522+
(PrepareFail(_), _) | (_, PrepareFail(_)) => Comparison::PrepareFail,
523+
(Error, _) | (_, Error) => Comparison::Error,
524524
(TestFail(_) | TestPass, TestSkipped) | (TestSkipped, TestFail(_) | TestPass) => {
525525
panic!("can't compare {res1} and {res2}");
526526
}
@@ -838,6 +838,8 @@ mod tests {
838838
// PrepareFail
839839
PrepareFail(Unknown), BuildFail(Unknown) => PrepareFail;
840840
BuildFail(Unknown), PrepareFail(Unknown) => PrepareFail;
841+
PrepareFail(Unknown), Error => PrepareFail;
842+
Error, PrepareFail(Unknown) => PrepareFail;
841843

842844
// Errors
843845
Error, TestPass => Error;
@@ -870,6 +872,11 @@ mod tests {
870872
TestSkipped, BrokenCrate(BrokenReason::Unknown) => Broken;
871873
TestFail(Unknown), BrokenCrate(BrokenReason::Unknown) => Broken;
872874
BuildFail(Unknown), BrokenCrate(BrokenReason::Unknown) => Broken;
875+
876+
PrepareFail(Unknown), BrokenCrate(BrokenReason::Unknown) => Broken;
877+
BrokenCrate(BrokenReason::Unknown), PrepareFail(Unknown) => Broken;
878+
BrokenCrate(BrokenReason::Unknown), Error => Broken;
879+
Error, BrokenCrate(BrokenReason::Unknown) => Broken;
873880
]
874881
);
875882

0 commit comments

Comments
 (0)