Merge "cargo_embargo: include testdata path when File::open fails" in…

…to main
aosp-mirror · Oct 20, 2023 · 4f85b5c · 4f85b5c
2 parents 0bd02ce + 7d46558
commit 4f85b5c
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/tools/cargo_embargo/src/cargo/metadata.rs b/tools/cargo_embargo/src/cargo/metadata.rs
@@ -310,7 +310,13 @@ mod tests {
         for testdata_directory_path in testdata_directories() {
             let cfg: Config = serde_json::from_reader(
                 File::open(testdata_directory_path.join("cargo_embargo.json"))
-                    .expect("Failed to open cargo_embargo.json"),
+                    .with_context(|| {
+                        format!(
+                            "Failed to open {:?}",
+                            testdata_directory_path.join("cargo_embargo.json")
+                        )
+                    })
+                    .unwrap(),
             )
             .unwrap();
             let cargo_metadata_path = testdata_directory_path.join("cargo.metadata");