Skip to content

Commit 821ff46

Browse files
committed
Include message on tests that should panic
1 parent ddf4386 commit 821ff46

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

src/libtest/lib.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1546,6 +1546,7 @@ fn calc_result(desc: &TestDesc, task_result: Result<(), Box<dyn Any + Send>>) ->
15461546
}
15471547
}
15481548
}
1549+
(&ShouldPanic::Yes, Ok(())) => TrFailedMsg("test did not panic as expected".to_string()),
15491550
_ if desc.allow_fail => TrAllowedFail,
15501551
_ => TrFailed,
15511552
}

src/libtest/tests.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use super::*;
22

33
use crate::test::{
44
filter_tests, parse_opts, run_test, DynTestFn, DynTestName, MetricMap, RunIgnored,
5-
ShouldPanic, StaticTestName, TestDesc, TestDescAndFn, TestOpts, TrFailed, TrFailedMsg,
5+
ShouldPanic, StaticTestName, TestDesc, TestDescAndFn, TestOpts, TrFailedMsg,
66
TrIgnored, TrOk,
77
};
88
use std::sync::mpsc::channel;
@@ -167,7 +167,7 @@ fn test_should_panic_but_succeeds() {
167167
let (tx, rx) = channel();
168168
run_test(&TestOpts::new(), false, desc, tx, Concurrent::No);
169169
let (_, res, _, _) = rx.recv().unwrap();
170-
assert!(res == TrFailed);
170+
assert!(res == TrFailedMsg("test did not panic as expected".to_string()));
171171
}
172172

173173
fn report_time_test_template(report_time: bool) -> Option<TestExecTime> {

0 commit comments

Comments
 (0)