fixed tests/made more robust

Author: philocalyst

tests/common.rs

@@ -9,6 +9,16 @@ pub fn cargo_bundle_bin() -> PathBuf {
     project_root().join("target/debug/cargo-bundle")
 }
 
+#[cfg(test)]
+#[allow(dead_code)] // Used in tests
+pub fn parse_bundle_paths(stdout: &str) -> Vec<PathBuf> {
+    stdout
+        .lines()
+        .filter(|line| line.starts_with("        "))
+        .map(|line| PathBuf::from(line.trim()))
+        .collect()
+}
+
 /// Places a valid-enough binary at `target/debug/examples/<name>` so that
 /// cargo-bundle (running with CARGO_BUNDLE_SKIP_BUILD) has something to package.
 pub fn setup_example_binary(name: &str) {

tests/goodbye.rs

@@ -55,27 +55,21 @@ fn deb() {
         String::from_utf8_lossy(&output.stderr)
     );
 
-    let arch = if cfg!(target_arch = "x86_64") {
-        "amd64"
-    } else if cfg!(target_arch = "aarch64") {
-        "arm64"
-    } else {
-        "amd64"
-    };
-
-    let deb_path = root.join(format!(
-        "target/debug/examples/bundle/deb/goodbye_0.9.1_{arch}.deb"
-    ));
+    let bundle_paths = common::parse_bundle_paths(&String::from_utf8_lossy(&output.stdout));
+    assert_eq!(bundle_paths.len(), 1, "Expected exactly one bundle path");
+    let deb_path = &bundle_paths[0];
     assert!(
         deb_path.exists(),
         "Debian package not found at {:?}",
         deb_path
     );
 
     // The 128x128 PNG should have been placed in the hicolor icon tree.
-    let icon_path = root.join(format!(
-        "target/debug/examples/bundle/deb/goodbye_0.9.1_{arch}/data/usr/share/icons/hicolor/128x128/apps/goodbye.png"
-    ));
+    let package_dir = deb_path
+        .parent()
+        .unwrap()
+        .join(deb_path.file_stem().unwrap());
+    let icon_path = package_dir.join("data/usr/share/icons/hicolor/128x128/apps/goodbye.png");
     assert!(
         icon_path.exists(),
         "PNG icon not found in deb data at {:?}",

tests/hello.rs

@@ -36,7 +36,6 @@ fn osx() {
 }
 
 #[test]
-#[cfg(target_os = "linux")]
 fn deb() {
     common::setup_example_binary("hello");
 
@@ -55,27 +54,21 @@ fn deb() {
         String::from_utf8_lossy(&output.stderr)
     );
 
-    let arch = if cfg!(target_arch = "x86_64") {
-        "amd64"
-    } else if cfg!(target_arch = "aarch64") {
-        "arm64"
-    } else {
-        "amd64"
-    };
-
-    let deb_path = root.join(format!(
-        "target/debug/examples/bundle/deb/hello_0.9.1_{arch}.deb"
-    ));
+    let bundle_paths = common::parse_bundle_paths(&String::from_utf8_lossy(&output.stdout));
+    assert_eq!(bundle_paths.len(), 1, "Expected exactly one bundle path");
+    let deb_path = &bundle_paths[0];
     assert!(
         deb_path.exists(),
         "Debian package not found at {:?}",
         deb_path
     );
 
     // SVG should be copied to the scalable hicolor directory.
-    let svg_path = root.join(format!(
-        "target/debug/examples/bundle/deb/hello_0.9.1_{arch}/data/usr/share/icons/hicolor/scalable/apps/hello.svg"
-    ));
+    let package_dir = deb_path
+        .parent()
+        .unwrap()
+        .join(deb_path.file_stem().unwrap());
+    let svg_path = package_dir.join("data/usr/share/icons/hicolor/scalable/apps/hello.svg");
     assert!(
         svg_path.exists(),
         "SVG icon not found in deb data at {:?}",