summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJoakim Hulthe <joakim@hulthe.net>2024-08-28 14:42:22 +0200
committerMarkus Pettersson <markus.pettersson@mullvad.net>2024-08-28 15:07:07 +0200
commit21369892648d638a73c03f007e1fe00086a29ccd (patch)
tree5c0e92f5cacc57ab1d248b1d860b4a3e4b4d0c8f
parent074f525855f33ef54ca24b39e32c03c4946c8bed (diff)
downloadmullvadvpn-21369892648d638a73c03f007e1fe00086a29ccd.tar.xz
mullvadvpn-21369892648d638a73c03f007e1fe00086a29ccd.zip
Add package-dir to "Could not find app" error
-rw-r--r--test/test-manager/src/package.rs12
1 files changed, 7 insertions, 5 deletions
diff --git a/test/test-manager/src/package.rs b/test/test-manager/src/package.rs
index 295557907e..4791556392 100644
--- a/test/test-manager/src/package.rs
+++ b/test/test-manager/src/package.rs
@@ -100,9 +100,9 @@ fn find_app(
app.make_ascii_lowercase();
let current_dir = std::env::current_dir().expect("Unable to get current directory");
- let packages_dir = package_dir.unwrap_or(&current_dir);
- std::fs::create_dir_all(packages_dir)?;
- let dir = std::fs::read_dir(packages_dir.clone()).context("Failed to list packages")?;
+ let package_dir = package_dir.unwrap_or(&current_dir);
+ std::fs::create_dir_all(package_dir)?;
+ let dir = std::fs::read_dir(package_dir.clone()).context("Failed to list packages")?;
dir
.filter_map(|entry| entry.ok())
@@ -129,12 +129,14 @@ fn find_app(
}) // Skip file if it doesn't match the architecture
.sorted_unstable_by_key(|(_path, u8_path)| u8_path.len())
.find(|(_path, u8_path)| u8_path.contains(&app)) // Find match
- .map(|(path, _)| path).context(if e2e_bin {
+ .map(|(path, _)| path)
+ .with_context(|| format!("Directory searched: {}", package_dir.display()))
+ .with_context(|| if e2e_bin {
format!(
"Could not find UI/e2e test for package: {app}.\n\
Expecting a binary named like `app-e2e-tests-{app}_ARCH` to exist in {package_dir}/\n\
Example ARCH: `amd64-unknown-linux-gnu`, `x86_64-unknown-linux-gnu`",
- package_dir = packages_dir.display()
+ package_dir = package_dir.display()
)
} else {
format!("Could not find package for app: {app}")