Skip to content

Commit db3e1b9

Browse files
Mitchell KemberRebase bot
authored andcommitted
[rust][test] Search for {{{reset}}} or {{{reset:begin}}}
This CL makes rust_runner_integration_test look for either {{{reset}}} or {{{reset:begin}}} in logs. Before, it only looked for the former. This is blocking the Rust toolchain roll, because after rolling the logs contain the latter instead. Here is what led to this: * I0c4b787f79fe0d8f62370e302d232e77087e2de4 added support for backtrace prettifying, which uses {{{reset:begin}}} and {{{reset:end}}} instead of just {{{reset}}}. * Idcb28b8c9a3269f0e1534b703d9231e8d452d801 made the Rust runner integration test look for {{{reset}}} in the output. * rust-lang/backtrace-rs#559 made backtrace-rs start emitting {{{reset:begin}}} and {{{reset:end}}}. * rust-lang/rust@249595b bumped rustc to use the new backtrace-rs. Test: fx test rust_runner_integration_test Bug: 132466, 59736 Change-Id: Ibec5d50b4c5d62f003178dc2b825ebde007a62a8 Reviewed-on: https://fuchsia-review.googlesource.com/c/fuchsia/+/907287 Reviewed-by: Tyler Mandry <[email protected]> Reviewed-by: Ankur Mittal <[email protected]> Commit-Queue: Mitchell Kember <[email protected]>
1 parent dadbea7 commit db3e1b9

File tree

1 file changed

+6
-7
lines changed
  • src/sys/test_runners/rust/tests

1 file changed

+6
-7
lines changed

src/sys/test_runners/rust/tests/main.rs

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -99,30 +99,29 @@ async fn launch_and_run_sample_test_internal(parallel: u16) {
9999

100100
assert_eq!(expected_events, events_without_failing_test_logs);
101101

102-
let reset = "{{{reset}}}";
103102
let (reset_index, _) = failing_test_logs
104103
.iter()
105104
.enumerate()
106105
.find(|(_, event)| {
107106
let RunEvent::CaseStderr { name: _, stderr_message: line } = event else {
108107
return false;
109108
};
110-
line == reset
109+
line == "{{{reset}}}" || line == "{{{reset:begin}}}"
111110
})
112111
.expect("should have reset log");
113112
assert!(failing_test_logs.len() > reset_index, "{:?}", failing_test_logs);
114-
let assert_contains = |msg| {
113+
let contains = |msg| {
115114
failing_test_logs[0..reset_index].iter().any(|event| {
116115
let RunEvent::CaseStderr { name: _, stderr_message: line } = event else {
117116
return false;
118117
};
119118
line.contains(msg)
120119
})
121120
};
122-
assert_contains("thread 'main' panicked at");
123-
assert_contains("I'm supposed to panic!()");
124-
assert_contains("../../src/sys/test_runners/rust/test_data/sample-rust-tests/src/lib.rs:20:9");
125-
assert_contains("stack backtrace:");
121+
assert!(contains("I'm supposed to panic!()"));
122+
assert!(contains(
123+
"../../src/sys/test_runners/rust/test_data/sample-rust-tests/src/lib.rs:20:9"
124+
));
126125
assert_eq!(
127126
failing_test_logs.last().unwrap(),
128127
&RunEvent::case_stderr("my_tests::failing_test", "test failed.")

0 commit comments

Comments
 (0)