Print detected tested guest OS version

mullvad · Apr 8, 2024 · 5eb50dd · 5eb50dd
1 parent 7f4ad14
commit 5eb50dd
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 0 deletions.
diff --git a/test/test-manager/src/run_tests.rs b/test/test-manager/src/run_tests.rs
@@ -49,6 +49,8 @@ pub async fn run(
     let mullvad_client =
         mullvad_daemon::new_rpc_client(connection_handle, mullvad_daemon_transport);
 
+    print_os_version(&client).await;
+
     let mut tests: Vec<_> = inventory::iter::<tests::TestMetadata>()
         .filter(|test| test.should_run_on_os(TEST_CONFIG.os))
         .collect();
@@ -220,3 +222,14 @@ where
         result,
     }
 }
+
+async fn print_os_version(client: &ServiceClient) {
+    match client.get_os_version().await {
+        Ok(version) => {
+            log::debug!("Guest OS version: {version}");
+        }
+        Err(error) => {
+            log::debug!("Failed to obtain guest OS version: {error}");
+        }
+    }
+}
diff --git a/test/test-rpc/src/meta.rs b/test/test-rpc/src/meta.rs
@@ -9,6 +9,16 @@ pub enum OsVersion {
     Windows(WindowsVersion),
 }
 
+impl std::fmt::Display for OsVersion {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            OsVersion::Linux => f.write_str("Linux"),
+            OsVersion::Macos(version) => write!(f, "macOS {}", version.major),
+            OsVersion::Windows(version) => write!(f, "Windows {}", version.major),
+        }
+    }
+}
+
 #[derive(Debug, Serialize, Deserialize, PartialEq, Eq, Clone)]
 pub struct MacosVersion {
     pub major: u32,