diff options
| author | Sebastian Holmin <sebastian.holmin@mullvad.net> | 2024-07-22 14:52:52 +0200 |
|---|---|---|
| committer | Markus Pettersson <markus.pettersson@mullvad.net> | 2024-08-09 09:43:58 +0200 |
| commit | 2a283a82037cbe67ab7953420caa5c2c098b7cf2 (patch) | |
| tree | e421cb424f8d98c9aa2ef399343bc0f387e00766 | |
| parent | fce09afd48cdb5730d64be541f86768adf19e93b (diff) | |
| download | mullvadvpn-2a283a82037cbe67ab7953420caa5c2c098b7cf2.tar.xz mullvadvpn-2a283a82037cbe67ab7953420caa5c2c098b7cf2.zip | |
Improve directory seach logic for UI tests
| -rw-r--r-- | test/test-manager/src/package.rs | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/test/test-manager/src/package.rs b/test/test-manager/src/package.rs index f3fd535673..fbfba1e48d 100644 --- a/test/test-manager/src/package.rs +++ b/test/test-manager/src/package.rs @@ -34,6 +34,15 @@ pub fn get_app_manifest( .transpose()?; log::info!("App package to upgrade from: {app_package_to_upgrade_from_path:?}"); + // Automatically try to find the UI e2e tests based on the app package + + // Search the specified package folder, or same folder as the app package if missing + let ui_e2e_package_folder = package_folder.unwrap_or( + app_package_path + .parent() + .expect("Path to app package should have parent") + .into(), + ); let capture = VERSION_REGEX .captures(app_package_path.to_str().unwrap()) .with_context(|| format!("Cannot parse version: {}", app_package_path.display()))? @@ -41,7 +50,8 @@ pub fn get_app_manifest( .map(|c| c.as_str()) .expect("Could not parse version from package name: {app_package}"); - let ui_e2e_tests_path = find_app(capture, true, package_type, package_folder.as_ref()).ok(); + let ui_e2e_tests_path = + find_app(capture, true, package_type, Some(&ui_e2e_package_folder)).ok(); log::info!("GUI e2e test binary: {ui_e2e_tests_path:?}"); Ok(Manifest { |