Run tests in the order given

Author: Serock3

test/test-manager/src/main.rs

@@ -118,7 +118,8 @@ enum Commands {
         #[arg(long)]
         openvpn_certificate: Option<PathBuf>,
 
-        /// Only run tests matching substrings
+        /// Names of tests to run. The order given will be respected. If not set, all tests will be
+        /// run.
         test_filters: Vec<String>,
 
         /// Print results live

test/test-manager/src/run_tests.rs

@@ -2,7 +2,7 @@ use crate::{
     logging::{Logger, Panic, TestOutput, TestResult},
     mullvad_daemon::{self, MullvadClientArgument, RpcClientProvider},
     summary::SummaryLogger,
-    tests::{self, config::TEST_CONFIG, get_tests, TestContext},
+    tests::{self, config::TEST_CONFIG, get_tests, TestContext, TestMetadata},
     vm,
 };
 use anyhow::{Context, Result};
@@ -103,7 +103,7 @@ impl TestHandler<'_> {
 pub async fn run(
     config: tests::config::TestConfig,
     instance: &dyn vm::VmInstance,
-    test_filters: &[String],
+    specified_tests: &[String],
     skip_wait: bool,
     print_failed_tests_only: bool,
     summary_logger: Option<SummaryLogger>,
@@ -141,21 +141,7 @@ pub async fn run(
         logger: Logger::get_or_init(),
     };
 
-    let mut tests = get_tests();
-
-    tests.retain(|test| test.should_run_on_os(TEST_CONFIG.os));
-
-    if !test_filters.is_empty() {
-        tests.retain(|test| {
-            for command in test_filters {
-                let command = command.to_lowercase();
-                if test.command.to_lowercase().contains(&command) {
-                    return true;
-                }
-            }
-            false
-        });
-    }
+    let tests = get_filtered_tests(specified_tests)?;
 
     if TEST_CONFIG.app_package_to_upgrade_from_filename.is_some() {
         test_handler
@@ -192,6 +178,26 @@ pub async fn run(
     Ok(result)
 }
 
+fn get_filtered_tests(specified_tests: &[String]) -> Result<Vec<&TestMetadata>, anyhow::Error> {
+    let mut tests = get_tests();
+    tests.retain(|test| test.should_run_on_os(TEST_CONFIG.os));
+    if !specified_tests.is_empty() {
+        specified_tests
+            .iter()
+            .map(|f| {
+                tests
+                    .iter()
+                    .find(|t| t.command.eq_ignore_ascii_case(f))
+                    .cloned()
+                    .ok_or(anyhow::anyhow!("Test '{f}' not found"))
+            })
+            .collect()
+    } else {
+        // Keep all tests
+        Ok(tests)
+    }
+}
+
 async fn register_test_result(
     test_result: TestResult,
     failed_tests: &mut Vec<&str>,