diff options
| author | David Lönnhager <david.l@mullvad.net> | 2024-04-08 16:38:19 +0200 |
|---|---|---|
| committer | David Lönnhager <david.l@mullvad.net> | 2024-04-08 16:42:31 +0200 |
| commit | 5eb50dd7d68fb0a5231424edf5f68afae5f4df83 (patch) | |
| tree | 9a2771f538a350d687afd9b4100a535b210b3bba /test | |
| parent | 7f4ad1405a36323d8203c904f515bd1e0329bec3 (diff) | |
| download | mullvadvpn-5eb50dd7d68fb0a5231424edf5f68afae5f4df83.tar.xz mullvadvpn-5eb50dd7d68fb0a5231424edf5f68afae5f4df83.zip | |
Print detected tested guest OS version
Diffstat (limited to 'test')
| -rw-r--r-- | test/test-manager/src/run_tests.rs | 13 | ||||
| -rw-r--r-- | test/test-rpc/src/meta.rs | 10 |
2 files changed, 23 insertions, 0 deletions
diff --git a/test/test-manager/src/run_tests.rs b/test/test-manager/src/run_tests.rs index 6b3da37138..b2b1e9534b 100644 --- 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 index 7f59d3c0ba..40dda3bb9c 100644 --- 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, |
