Do not fail when specifying tests skipped for OS

When starting e2e tests on multiple platforms, we always specify
the same list of tests for all paltforms. Therefore we should not
fail on parsing a test that is skipped for the current platform.

1 files changed, 10 insertions, 8 deletions

diff --git a/test/test-manager/src/tests/mod.rs b/test/test-manager/src/tests/mod.rs
index ca24cd63bf..0c595320f3 100644
--- a/test/test-manager/src/tests/mod.rs
+++ b/test/test-manager/src/tests/mod.rs
@@ -83,9 +83,12 @@ pub fn get_tests() -> Vec<&'static TestMetadata> {
 }
 
 pub 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() {
+    let tests = get_tests();
+
+    let mut tests = if specified_tests.is_empty() {
+        // Keep all tests
+        tests
+    } else {
         specified_tests
             .iter()
             .map(|f| {
@@ -95,11 +98,10 @@ pub fn get_filtered_tests(specified_tests: &[String]) -> Result<Vec<&TestMetadat
                     .cloned()
                     .ok_or(anyhow::anyhow!("Test '{f}' not found"))
             })
-            .collect()
-    } else {
-        // Keep all tests
-        Ok(tests)
-    }
+            .collect::<Result<_, anyhow::Error>>()?
+    };
+    tests.retain(|test| test.should_run_on_os(TEST_CONFIG.os));
+    Ok(tests)
 }
 
 /// Make sure the daemon is installed and logged in and restore settings to the defaults.