Rename `--previous-app` to `--app-package-to-upgrade-from`

7 files changed, 28 insertions, 22 deletions

diff --git a/test/README.md b/test/README.md
index b0d37f7877..b490166ef5 100644
--- a/test/README.md
+++ b/test/README.md
@@ -116,7 +116,7 @@ cargo run --bin test-manager run-tests debian11 \
     --display \
     --account 0123456789 \
     --app-package <git hash or tag> \
-    --previous-app 2023.2
+    --app-package-to-upgrade-from 2023.2
 ```
 
 ## macOS
@@ -142,7 +142,7 @@ cargo run --bin test-manager run-tests macos-ventura \
     --display \
     --account 0123456789 \
     --app-package <git hash or tag> \
-    --previous-app 2023.2
+    --app-package-to-upgrade-from 2023.2
 ```
 
 ## Note on `ci-runtests.sh`
diff --git a/test/ci-runtests.sh b/test/ci-runtests.sh
index 71aff6061b..e6b7ba7b18 100755
--- a/test/ci-runtests.sh
+++ b/test/ci-runtests.sh
@@ -198,7 +198,7 @@ function run_tests_for_os {
         run-tests \
         --account "${ACCOUNT_TOKEN:?Error: ACCOUNT_TOKEN not set}" \
         --app-package "${cur_filename}" \
-        --previous-app "${prev_filename}" \
+        --app-package-to-upgrade-from "${prev_filename}" \
         --package-folder "$PACKAGES_DIR" \
         --test-report "$SCRIPT_DIR/.ci-logs/${os}_report" \
         "$os" 2>&1 | sed "s/${ACCOUNT_TOKEN}/\{ACCOUNT_TOKEN\}/g"
diff --git a/test/test-manager/src/main.rs b/test/test-manager/src/main.rs
index 73942ca0cd..8dd56e6a03 100644
--- a/test/test-manager/src/main.rs
+++ b/test/test-manager/src/main.rs
@@ -97,7 +97,7 @@ enum Commands {
         ///
         /// The CLI interface must be compatible with the upgrade test.
         #[arg(long)]
-        previous_app: Option<String>,
+        app_package_to_upgrade_from: Option<String>,
 
         /// Folder to search for packages. Defaults to current directory.
         #[arg(long, value_name = "DIR")]
@@ -225,7 +225,7 @@ async fn main() -> Result<()> {
             vnc,
             account,
             app_package,
-            previous_app,
+            app_package_to_upgrade_from,
             package_folder,
             test_filters,
             verbose,
@@ -260,9 +260,13 @@ async fn main() -> Result<()> {
                 None => None,
             };
 
-            let manifest =
-                package::get_app_manifest(vm_config, app_package, previous_app, package_folder)
-                    .context("Could not find the specified app packages")?;
+            let manifest = package::get_app_manifest(
+                vm_config,
+                app_package,
+                app_package_to_upgrade_from,
+                package_folder,
+            )
+            .context("Could not find the specified app packages")?;
 
             let mut instance = vm::run(&config, &name)
                 .await
@@ -290,8 +294,8 @@ async fn main() -> Result<()> {
                         .unwrap()
                         .to_string_lossy()
                         .into_owned(),
-                    previous_app_filename: manifest
-                        .previous_app_path
+                    app_package_to_upgrade_from_filename: manifest
+                        .app_package_to_upgrade_from_path
                         .map(|path| path.file_name().unwrap().to_string_lossy().into_owned()),
                     ui_e2e_tests_filename: manifest
                         .ui_e2e_tests_path
diff --git a/test/test-manager/src/package.rs b/test/test-manager/src/package.rs
index 3169d66221..61036a69e3 100644
--- a/test/test-manager/src/package.rs
+++ b/test/test-manager/src/package.rs
@@ -10,7 +10,7 @@ static VERSION_REGEX: Lazy<Regex> =
 #[derive(Debug, Clone)]
 pub struct Manifest {
     pub app_package_path: PathBuf,
-    pub previous_app_path: Option<PathBuf>,
+    pub app_package_to_upgrade_from_path: Option<PathBuf>,
     pub ui_e2e_tests_path: Option<PathBuf>,
 }
 
@@ -21,7 +21,7 @@ pub struct Manifest {
 pub fn get_app_manifest(
     config: &VmConfig,
     app_package: String,
-    previous_app: Option<String>,
+    app_package_to_upgrade_from: Option<String>,
     package_folder: Option<PathBuf>,
 ) -> Result<Manifest> {
     let package_type = (config.os_type, config.package_type, config.architecture);
@@ -29,10 +29,10 @@ pub fn get_app_manifest(
     let app_package_path = find_app(&app_package, false, package_type, package_folder.as_ref())?;
     log::info!("App package: {}", app_package_path.display());
 
-    let previous_app_path = previous_app
+    let app_package_to_upgrade_from_path = app_package_to_upgrade_from
         .map(|app| find_app(&app, false, package_type, package_folder.as_ref()))
         .transpose()?;
-    log::info!("Previous app: {previous_app_path:?}");
+    log::info!("App package to upgrade from: {app_package_to_upgrade_from_path:?}");
 
     let capture = VERSION_REGEX
         .captures(app_package_path.to_str().unwrap())
@@ -46,7 +46,7 @@ pub fn get_app_manifest(
 
     Ok(Manifest {
         app_package_path,
-        previous_app_path,
+        app_package_to_upgrade_from_path,
         ui_e2e_tests_path,
     })
 }
diff --git a/test/test-manager/src/tests/config.rs b/test/test-manager/src/tests/config.rs
index e845e1ab26..58ebc4fa01 100644
--- a/test/test-manager/src/tests/config.rs
+++ b/test/test-manager/src/tests/config.rs
@@ -13,7 +13,7 @@ pub struct TestConfig {
 
     pub artifacts_dir: String,
     pub app_package_filename: String,
-    pub previous_app_filename: Option<String>,
+    pub app_package_to_upgrade_from_filename: Option<String>,
     pub ui_e2e_tests_filename: Option<String>,
 
     /// Used to override MULLVAD_API_*, for conncheck,
diff --git a/test/test-manager/src/tests/install.rs b/test/test-manager/src/tests/install.rs
index 4eae98d63a..0c9e2b82fd 100644
--- a/test/test-manager/src/tests/install.rs
+++ b/test/test-manager/src/tests/install.rs
@@ -24,7 +24,7 @@ pub async fn test_install_previous_app(_: TestContext, rpc: ServiceClient) -> an
     log::debug!("Installing old app");
     rpc.install_app(get_package_desc(
         TEST_CONFIG
-            .previous_app_filename
+            .app_package_to_upgrade_from_filename
             .as_ref()
             .context("Missing previous app version")?,
     )?)
diff --git a/test/test-manager/src/vm/provision.rs b/test/test-manager/src/vm/provision.rs
index abe827e098..f440cbe9c8 100644
--- a/test/test-manager/src/vm/provision.rs
+++ b/test/test-manager/src/vm/provision.rs
@@ -117,8 +117,10 @@ fn blocking_ssh(
     // Transfer app packages
     ssh_send_file_path(&session, &local_app_manifest.app_package_path, temp_dir)
         .context("Failed to send current app package to remote")?;
-    if let Some(previous_app_path) = &local_app_manifest.previous_app_path {
-        ssh_send_file_path(&session, previous_app_path, temp_dir)
+    if let Some(app_package_to_upgrade_from_path) =
+        &local_app_manifest.app_package_to_upgrade_from_path
+    {
+        ssh_send_file_path(&session, app_package_to_upgrade_from_path, temp_dir)
             .context("Failed to send previous app package to remote")?;
     } else {
         log::warn!("No previous app to send to remote")
@@ -160,8 +162,8 @@ fn blocking_ssh(
         .file_name()
         .unwrap()
         .to_string_lossy();
-    let previous_app_path = local_app_manifest
-        .previous_app_path
+    let app_package_to_upgrade_from_path = local_app_manifest
+        .app_package_to_upgrade_from_path
         .map(|path| path.file_name().unwrap().to_string_lossy().into_owned())
         .unwrap_or_default();
     let ui_e2e_tests_path = local_app_manifest
@@ -170,7 +172,7 @@ fn blocking_ssh(
         .unwrap_or_default();
 
     let cmd = format!(
-        "sudo {} {remote_dir} \"{app_package_path}\" \"{previous_app_path}\" \"{ui_e2e_tests_path}\"",
+        "sudo {} {remote_dir} \"{app_package_path}\" \"{app_package_to_upgrade_from_path}\" \"{ui_e2e_tests_path}\"",
         dest.display()
     );
     log::debug!("Running setup script on remote, cmd: {cmd}");