tor-browser

commit ea950bff4a837e43abe7d05fbaae5da0a4f9ec45
parent 496027b477b663b9bbc2140b34dadfc4d6b1d059
Author: Alex Franchuk <afranchuk@mozilla.com>
Date:   Wed,  8 Oct 2025 20:16:08 +0000

Bug 1993330 p1 - Revert Bug 1989441 upon which the Legacy Telemetry crash ping depends r=gstoll

This reverts commit 2b6e28a0587274d9b068451d6c8a3d841f0825f4.

Differential Revision: https://phabricator.services.mozilla.com/D268023

Diffstat:
M
toolkit/crashreporter/client/app/src/main.rs
 | 
4
++++
M
toolkit/crashreporter/client/app/src/test.rs
 | 
42
++++++++++++++++++++++++++++++++++++++++++

2 files changed, 46 insertions(+), 0 deletions(-)
diff --git a/toolkit/crashreporter/client/app/src/main.rs b/toolkit/crashreporter/client/app/src/main.rs
@@ -161,6 +161,10 @@ fn report_main() {
     // Create a default mock environment which allows successful operation.
     let mut mock = mock::builder();
     mock.set(
+        Command::mock("work_dir/pingsender"),
+        Box::new(|_| Ok(crate::std::process::success_output())),
+    )
+    .set(
         Command::mock("curl"),
         Box::new(|_| {
             let mut output = crate::std::process::success_output();
diff --git a/toolkit/crashreporter/client/app/src/test.rs b/toolkit/crashreporter/client/app/src/test.rs
@@ -190,6 +190,10 @@ impl GuiTest {
         // Create a default mock environment which allows successful operation.
         let mut mock = mock::builder();
         mock.set(
+            Command::mock("work_dir/pingsender"),
+            Box::new(|_| Ok(crate::std::process::success_output())),
+        )
+        .set(
             Command::mock("curl"),
             Box::new(|_| {
                 let mut output = crate::std::process::success_output();
@@ -739,6 +743,44 @@ fn network_failure() {
 }
 
 #[test]
+fn pingsender_failure() {
+    let mut test = GuiTest::new();
+    test.mock.set(
+        Command::mock("work_dir/pingsender"),
+        Box::new(|_| Err(ErrorKind::NotFound.into())),
+    );
+    test.files.add_dir("events_dir").add_file(
+        "events_dir/minidump",
+        "1\n\
+         12:34:56\n\
+         e0423878-8d59-4452-b82e-cad9c846836e\n\
+         {\"foo\":\"bar\"}",
+    );
+    test.run(|interact| {
+        interact.element("quit", |_style, b: &model::Button| b.click.fire(&()));
+    });
+    test.assert_files()
+        .saved_settings(Settings::default())
+        .submitted()
+        .submission_event(true)
+        .check(
+            "events_dir/minidump",
+            format!(
+                "1\n\
+                12:34:56\n\
+                e0423878-8d59-4452-b82e-cad9c846836e\n\
+                {}",
+                serde_json::json! {{
+                    "foo": "bar",
+                    "MinidumpSha256Hash": MOCK_MINIDUMP_SHA256,
+                    // No crash ping UUID since pingsender fails
+                    "StackTraces": { "status": "OK" }
+                }}
+            ),
+        );
+}
+
+#[test]
 fn glean_ping() {
     let mut test = GuiTest::new();
     test.enable_glean_pings();