[rust][test] Updating panic message handlers

The latest rust nightly changed the formatting of panic messages in
rust-lang/rust#112849 so that the message now
comes after the source info. This CL updates all checks against the
panic message to properly match the new format.

Bug: 130265
Test: fx test component_manager_logger_test rust-runner-integration-test
host_x64/obj/tools/testing/testparser/test.sh host_x64/symbolizer_tests

Change-Id: Idcb28b8c9a3269f0e1534b703d9231e8d452d801
Reviewed-on: https://fuchsia-review.googlesource.com/c/fuchsia/+/900340
Reviewed-by: Dangyi Liu <[email protected]>
Reviewed-by: Adam Perry <[email protected]>
Reviewed-by: Ankur Mittal <[email protected]>
Reviewed-by: Tyler Mandry <[email protected]>
Commit-Queue: Tyler Mandry <[email protected]>
Reviewed-by: Mike McCreavy <[email protected]>

src/recovery/diagnostics/gumshoe/README.md

@@ -45,9 +45,9 @@ can force this test to fail by altering it:
 and running the "fx test" command above, and then inspecting
 ~/output.txt for the error:
 
-thread 'main' panicked at
-'MockHandlebarsTrait::trait_register_template_file:
-Expectation(<anything>) called more than 3 times'
+thread 'main' panicked at ...:
+MockHandlebarsTrait::trait_register_template_file:
+Expectation(<anything>) called more than 3 times
 
 How To Run Interactively (Harder)
 

src/sys/component_manager/lib/logger/src/klog.rs

@@ -224,10 +224,8 @@ mod tests {
             // This will panic again if the message is not found,
             // and the message will not include "panic_test".
             old_hook(info);
-            expect_message_in_debuglog(format!(
-                "[component_manager] PANIC: panicked at 'panic_test {}'",
-                logged_value
-            ));
+            expect_message_in_debuglog(format!("[component_manager] PANIC: panicked at"));
+            expect_message_in_debuglog(format!("panic_test {logged_value}"));
         }));
 
         init();

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

@@ -99,16 +99,30 @@ async fn launch_and_run_sample_test_internal(parallel: u16) {
 
     assert_eq!(expected_events, events_without_failing_test_logs);
 
-    let panic_message = r"thread 'main' panicked at 'I'm supposed panic!()', ../../src/sys/test_runners/rust/test_data/sample-rust-tests/src/lib.rs:20:9";
-    assert!(failing_test_logs.len() > 3, "{:?}", failing_test_logs);
-    assert_eq!(
-        &failing_test_logs[0..3],
-        &[
-            RunEvent::case_stderr("my_tests::failing_test", panic_message),
-            RunEvent::case_stderr("my_tests::failing_test", "stack backtrace:"),
-            RunEvent::case_stderr("my_tests::failing_test", "{{{reset}}}"),
-        ]
-    );
+    let reset = "{{{reset}}}";
+    let (reset_index, _) = failing_test_logs
+        .iter()
+        .enumerate()
+        .find(|(_, event)| {
+            let RunEvent::CaseStderr { name: _, stderr_message: line } = event else {
+                return false;
+            };
+            line == reset
+        })
+        .expect("should have reset log");
+    assert!(failing_test_logs.len() > reset_index, "{:?}", failing_test_logs);
+    let assert_contains = |msg| {
+        failing_test_logs[0..reset_index].iter().any(|event| {
+            let RunEvent::CaseStderr { name: _, stderr_message: line } = event else {
+                return false;
+            };
+            line.contains(msg)
+        })
+    };
+    assert_contains("thread 'main' panicked at");
+    assert_contains("I'm supposed panic!()");
+    assert_contains("../../src/sys/test_runners/rust/test_data/sample-rust-tests/src/lib.rs:20:9");
+    assert_contains("stack backtrace:");
     assert_eq!(
         failing_test_logs.last().unwrap(),
         &RunEvent::case_stderr("my_tests::failing_test", "test failed.")

tools/symbolizer/test_cases/rust_crasher_stdout.in

@@ -1,5 +1,6 @@
 # This is the stdout of `fx shell run fuchsia-pkg://fuchsia.com/crasher#meta/rust_crasher.cmx`
-thread 'main' panicked at 'I HAVE PANICKED', ../../src/developer/forensics/crasher/rust/src/main.rs:6:5
+thread 'main' panicked at ../../src/developer/forensics/crasher/rust/src/main.rs:6:5
+I HAVE PANICKED
 stack backtrace:
 {{{reset}}}
 {{{module:0x0::elf:e1c9115da8f4a732}}}

tools/symbolizer/test_cases/rust_crasher_stdout.out

@@ -1,5 +1,6 @@
 # This is the stdout of `fx shell run fuchsia-pkg://fuchsia.com/crasher#meta/rust_crasher.cmx`
-thread 'main' panicked at 'I HAVE PANICKED', ../../src/developer/forensics/crasher/rust/src/main.rs:6:5
+thread 'main' panicked at ../../src/developer/forensics/crasher/rust/src/main.rs:6:5
+I HAVE PANICKED
 stack backtrace:
 [[[ELF module #0x0 "" BuildID=e1c9115da8f4a732 0x75701d1000]]]
 [[[ELF module #0x1 "libfdio.so" BuildID=f60992baff92044c 0x260ea9cc000]]]

tools/testing/testparser/testparser_test.go

@@ -537,11 +537,13 @@ booooo I printed an error, but it doesn't count as fail reason
 [stdout - legacy_test]
 ---- tests::test_add stderr ----
 [stdout - legacy_test]
-thread 'main' panicked at 'assertion failed: ` + "`(left != right)`" + `
+thread 'main' panicked at ../../src/lib/zircon/rust/src/channel.rs:761:9:
+[stdout - legacy_test]
+assertion failed: ` + "`(left != right)`" + `
 [stdout - legacy_test]
   left: ` + "`ObjectType(PORT)`" + `,
 [stdout - legacy_test]
-  right: ` + "`ObjectType(PORT)`', ../../src/lib/zircon/rust/src/channel.rs:761:9`" + `
+  right: ` + "`ObjectType(PORT)`" + `
 [stdout - legacy_test]
 stack backtrace:
 [stdout - legacy_test]
@@ -556,11 +558,13 @@ stack backtrace:
 [stdout - legacy_test]
 ---- tests::test_substract stderr ----
 [stdout - legacy_test]
-thread 'main' panicked at 'assertion failed: ` + "`(left != right)`" + `
+thread 'main' panicked at ../../src/lib/zircon/rust/src/channel.rs:783:9:
+[stdout - legacy_test]
+assertion failed: ` + "`(left != right)`" + `
 [stdout - legacy_test]
   left: ` + "`Err((5, 0))`" + `,
 [stdout - legacy_test]
-  right: ` + "`Err((5, 0))`" + `', ../../src/lib/zircon/rust/src/channel.rs:783:9
+  right: ` + "`Err((5, 0))`" + `
 [stdout - legacy_test]
 stack backtrace:
 [stdout - legacy_test]
@@ -606,14 +610,14 @@ One or more test runs failed.`
 			CaseName:    "test_add",
 			Status:      runtests.TestFailure,
 			Format:      "Rust",
-			FailReason:  "thread 'main' panicked at 'assertion failed: `(left != right)`\n  left: `ObjectType(PORT)`,\n  right: `ObjectType(PORT)`', ../../src/lib/zircon/rust/src/channel.rs:761:9`",
+			FailReason:  "thread 'main' panicked at ../../src/lib/zircon/rust/src/channel.rs:761:9:\nassertion failed: `(left != right)`\n  left: `ObjectType(PORT)`,\n  right: `ObjectType(PORT)`",
 		}, {
 			DisplayName: "tests::test_substract",
 			SuiteName:   "tests",
 			CaseName:    "test_substract",
 			Status:      runtests.TestFailure,
 			Format:      "Rust",
-			FailReason:  "thread 'main' panicked at 'assertion failed: `(left != right)`\n  left: `Err((5, 0))`,\n  right: `Err((5, 0))`', ../../src/lib/zircon/rust/src/channel.rs:783:9",
+			FailReason:  "thread 'main' panicked at ../../src/lib/zircon/rust/src/channel.rs:783:9:\nassertion failed: `(left != right)`\n  left: `Err((5, 0))`,\n  right: `Err((5, 0))`",
 		},
 	}
 	testCaseCmp(t, stdout, want)