From 543265ddb2f39abd8b9d471e94ac4df1bb884304 Mon Sep 17 00:00:00 2001 From: Ilya Zlobintsev Date: Sun, 5 Jan 2025 15:27:03 +0200 Subject: [PATCH] chore: avoid error in vulkan when running tests --- lact-daemon/src/server/vulkan.rs | 2 +- .../snapshots/lact_daemon__tests__amd__hd7870.snap | 10 ++++++++++ .../snapshots/lact_daemon__tests__amd__r9-280.snap | 12 +++++++++++- .../snapshots/lact_daemon__tests__amd__rx5700xt.snap | 12 +++++++++++- .../snapshots/lact_daemon__tests__amd__rx580.snap | 12 +++++++++++- .../snapshots/lact_daemon__tests__amd__rx6600xt.snap | 12 +++++++++++- .../snapshots/lact_daemon__tests__amd__rx6900xt.snap | 12 +++++++++++- .../snapshots/lact_daemon__tests__amd__rx7700s.snap | 12 +++++++++++- .../snapshots/lact_daemon__tests__amd__rx7900xt.snap | 12 +++++++++++- .../snapshots/lact_daemon__tests__amd__vega56.snap | 12 +++++++++++- .../lact_daemon__tests__intel__cometlake.snap | 10 ++++++++++ .../lact_daemon__tests__intel__tigerlake.snap | 11 ++++++++++- .../lact_daemon__tests__nvidia__rtx4080.snap | 10 ++++++++++ lact-schema/src/lib.rs | 4 ++-- 14 files changed, 131 insertions(+), 12 deletions(-) diff --git a/lact-daemon/src/server/vulkan.rs b/lact-daemon/src/server/vulkan.rs index 3bdd503..b6a64cf 100644 --- a/lact-daemon/src/server/vulkan.rs +++ b/lact-daemon/src/server/vulkan.rs @@ -10,7 +10,7 @@ use vulkano::{ #[cfg_attr(test, allow(unreachable_code, unused_variables))] pub fn get_vulkan_info(pci_info: &GpuPciInfo) -> anyhow::Result { #[cfg(test)] - return Err(anyhow!("Not allowed in tests")); + return Ok(VulkanInfo::default()); trace!("Reading vulkan info"); let vendor_id = u32::from_str_radix(&pci_info.device_pci_info.vendor_id, 16)?; diff --git a/lact-daemon/src/tests/snapshots/lact_daemon__tests__amd__hd7870.snap b/lact-daemon/src/tests/snapshots/lact_daemon__tests__amd__hd7870.snap index 81f3a8f..7eb044d 100644 --- a/lact-daemon/src/tests/snapshots/lact_daemon__tests__amd__hd7870.snap +++ b/lact-daemon/src/tests/snapshots/lact_daemon__tests__amd__hd7870.snap @@ -22,6 +22,16 @@ expression: device_info "vendor": "PC Partner Limited / Sapphire Technology", "vendor_id": "174B" } + }, + "vulkan_info": { + "api_version": "", + "device_name": "", + "driver": { + "version": 0 + }, + "enabled_layers": [], + "extensions": {}, + "features": {} } }, "pci_info": { diff --git a/lact-daemon/src/tests/snapshots/lact_daemon__tests__amd__r9-280.snap b/lact-daemon/src/tests/snapshots/lact_daemon__tests__amd__r9-280.snap index a5fe375..bc1e2b8 100644 --- a/lact-daemon/src/tests/snapshots/lact_daemon__tests__amd__r9-280.snap +++ b/lact-daemon/src/tests/snapshots/lact_daemon__tests__amd__r9-280.snap @@ -23,7 +23,17 @@ expression: device_info "vendor_id": "1458" } }, - "vbios_version": "xxx-xxx-xxx" + "vbios_version": "xxx-xxx-xxx", + "vulkan_info": { + "api_version": "", + "device_name": "", + "driver": { + "version": 0 + }, + "enabled_layers": [], + "extensions": {}, + "features": {} + } }, "pci_info": { "device_pci_info": { diff --git a/lact-daemon/src/tests/snapshots/lact_daemon__tests__amd__rx5700xt.snap b/lact-daemon/src/tests/snapshots/lact_daemon__tests__amd__rx5700xt.snap index 9febf91..d6984ff 100644 --- a/lact-daemon/src/tests/snapshots/lact_daemon__tests__amd__rx5700xt.snap +++ b/lact-daemon/src/tests/snapshots/lact_daemon__tests__amd__rx5700xt.snap @@ -98,7 +98,17 @@ expression: device_info "vendor_id": "1DA2" } }, - "vbios_version": "113-D1990103-O09" + "vbios_version": "113-D1990103-O09", + "vulkan_info": { + "api_version": "", + "device_name": "", + "driver": { + "version": 0 + }, + "enabled_layers": [], + "extensions": {}, + "features": {} + } }, "pci_info": { "device_pci_info": { diff --git a/lact-daemon/src/tests/snapshots/lact_daemon__tests__amd__rx580.snap b/lact-daemon/src/tests/snapshots/lact_daemon__tests__amd__rx580.snap index 88c897a..bc422d7 100644 --- a/lact-daemon/src/tests/snapshots/lact_daemon__tests__amd__rx580.snap +++ b/lact-daemon/src/tests/snapshots/lact_daemon__tests__amd__rx580.snap @@ -98,7 +98,17 @@ expression: device_info "vendor_id": "1DA2" } }, - "vbios_version": "113-1E3871U-O4C" + "vbios_version": "113-1E3871U-O4C", + "vulkan_info": { + "api_version": "", + "device_name": "", + "driver": { + "version": 0 + }, + "enabled_layers": [], + "extensions": {}, + "features": {} + } }, "pci_info": { "device_pci_info": { diff --git a/lact-daemon/src/tests/snapshots/lact_daemon__tests__amd__rx6600xt.snap b/lact-daemon/src/tests/snapshots/lact_daemon__tests__amd__rx6600xt.snap index 20bd185..b76b056 100644 --- a/lact-daemon/src/tests/snapshots/lact_daemon__tests__amd__rx6600xt.snap +++ b/lact-daemon/src/tests/snapshots/lact_daemon__tests__amd__rx6600xt.snap @@ -23,7 +23,17 @@ expression: device_info "vendor_id": "1EAE" } }, - "vbios_version": "113-23L86HMD2-D02" + "vbios_version": "113-23L86HMD2-D02", + "vulkan_info": { + "api_version": "", + "device_name": "", + "driver": { + "version": 0 + }, + "enabled_layers": [], + "extensions": {}, + "features": {} + } }, "pci_info": { "device_pci_info": { diff --git a/lact-daemon/src/tests/snapshots/lact_daemon__tests__amd__rx6900xt.snap b/lact-daemon/src/tests/snapshots/lact_daemon__tests__amd__rx6900xt.snap index 8ac1a4e..1a2213d 100644 --- a/lact-daemon/src/tests/snapshots/lact_daemon__tests__amd__rx6900xt.snap +++ b/lact-daemon/src/tests/snapshots/lact_daemon__tests__amd__rx6900xt.snap @@ -59,7 +59,17 @@ expression: device_info "vendor_id": "1DA2" } }, - "vbios_version": "113-D4121EXT-CO1" + "vbios_version": "113-D4121EXT-CO1", + "vulkan_info": { + "api_version": "", + "device_name": "", + "driver": { + "version": 0 + }, + "enabled_layers": [], + "extensions": {}, + "features": {} + } }, "pci_info": { "device_pci_info": { diff --git a/lact-daemon/src/tests/snapshots/lact_daemon__tests__amd__rx7700s.snap b/lact-daemon/src/tests/snapshots/lact_daemon__tests__amd__rx7700s.snap index 2a2470c..182ce61 100644 --- a/lact-daemon/src/tests/snapshots/lact_daemon__tests__amd__rx7700s.snap +++ b/lact-daemon/src/tests/snapshots/lact_daemon__tests__amd__rx7700s.snap @@ -23,7 +23,17 @@ expression: device_info "vendor_id": "F111" } }, - "vbios_version": "113-BRT125778.001" + "vbios_version": "113-BRT125778.001", + "vulkan_info": { + "api_version": "", + "device_name": "", + "driver": { + "version": 0 + }, + "enabled_layers": [], + "extensions": {}, + "features": {} + } }, "pci_info": { "device_pci_info": { diff --git a/lact-daemon/src/tests/snapshots/lact_daemon__tests__amd__rx7900xt.snap b/lact-daemon/src/tests/snapshots/lact_daemon__tests__amd__rx7900xt.snap index 3a40021..2cef6cb 100644 --- a/lact-daemon/src/tests/snapshots/lact_daemon__tests__amd__rx7900xt.snap +++ b/lact-daemon/src/tests/snapshots/lact_daemon__tests__amd__rx7900xt.snap @@ -61,7 +61,17 @@ expression: device_info "vendor_id": "1DA2" } }, - "vbios_version": "113-D70401XT-N11" + "vbios_version": "113-D70401XT-N11", + "vulkan_info": { + "api_version": "", + "device_name": "", + "driver": { + "version": 0 + }, + "enabled_layers": [], + "extensions": {}, + "features": {} + } }, "pci_info": { "device_pci_info": { diff --git a/lact-daemon/src/tests/snapshots/lact_daemon__tests__amd__vega56.snap b/lact-daemon/src/tests/snapshots/lact_daemon__tests__amd__vega56.snap index 22a8aae..3c135bc 100644 --- a/lact-daemon/src/tests/snapshots/lact_daemon__tests__amd__vega56.snap +++ b/lact-daemon/src/tests/snapshots/lact_daemon__tests__amd__vega56.snap @@ -103,7 +103,17 @@ expression: device_info "vendor_id": "1043" } }, - "vbios_version": "115-D050PIL-100" + "vbios_version": "115-D050PIL-100", + "vulkan_info": { + "api_version": "", + "device_name": "", + "driver": { + "version": 0 + }, + "enabled_layers": [], + "extensions": {}, + "features": {} + } }, "pci_info": { "device_pci_info": { diff --git a/lact-daemon/src/tests/snapshots/lact_daemon__tests__intel__cometlake.snap b/lact-daemon/src/tests/snapshots/lact_daemon__tests__intel__cometlake.snap index 835d568..5d50a3a 100644 --- a/lact-daemon/src/tests/snapshots/lact_daemon__tests__intel__cometlake.snap +++ b/lact-daemon/src/tests/snapshots/lact_daemon__tests__intel__cometlake.snap @@ -35,6 +35,16 @@ expression: device_info "vendor": "Lenovo", "vendor_id": "17AA" } + }, + "vulkan_info": { + "api_version": "", + "device_name": "", + "driver": { + "version": 0 + }, + "enabled_layers": [], + "extensions": {}, + "features": {} } }, "pci_info": { diff --git a/lact-daemon/src/tests/snapshots/lact_daemon__tests__intel__tigerlake.snap b/lact-daemon/src/tests/snapshots/lact_daemon__tests__intel__tigerlake.snap index 627b86f..f131d96 100644 --- a/lact-daemon/src/tests/snapshots/lact_daemon__tests__intel__tigerlake.snap +++ b/lact-daemon/src/tests/snapshots/lact_daemon__tests__intel__tigerlake.snap @@ -1,7 +1,6 @@ --- source: lact-daemon/src/tests/mod.rs expression: device_info -snapshot_kind: text --- { "clocks_info": { @@ -36,6 +35,16 @@ snapshot_kind: text "vendor": "Lenovo", "vendor_id": "17AA" } + }, + "vulkan_info": { + "api_version": "", + "device_name": "", + "driver": { + "version": 0 + }, + "enabled_layers": [], + "extensions": {}, + "features": {} } }, "pci_info": { diff --git a/lact-daemon/src/tests/snapshots/lact_daemon__tests__nvidia__rtx4080.snap b/lact-daemon/src/tests/snapshots/lact_daemon__tests__nvidia__rtx4080.snap index a8b8eac..56c07d2 100644 --- a/lact-daemon/src/tests/snapshots/lact_daemon__tests__nvidia__rtx4080.snap +++ b/lact-daemon/src/tests/snapshots/lact_daemon__tests__nvidia__rtx4080.snap @@ -22,6 +22,16 @@ expression: device_info "vendor": "Micro-Star International Co., Ltd. [MSI]", "vendor_id": "1462" } + }, + "vulkan_info": { + "api_version": "", + "device_name": "", + "driver": { + "version": 0 + }, + "enabled_layers": [], + "extensions": {}, + "features": {} } }, "pci_info": { diff --git a/lact-schema/src/lib.rs b/lact-schema/src/lib.rs index 68654ee..b0fbb76 100644 --- a/lact-schema/src/lib.rs +++ b/lact-schema/src/lib.rs @@ -209,7 +209,7 @@ pub struct LinkInfo { pub max_speed: Option, } -#[derive(Serialize, Deserialize, Debug, Clone)] +#[derive(Serialize, Deserialize, Debug, Clone, Default)] pub struct VulkanInfo { pub device_name: String, pub api_version: String, @@ -220,7 +220,7 @@ pub struct VulkanInfo { } #[skip_serializing_none] -#[derive(Serialize, Deserialize, Debug, Clone)] +#[derive(Serialize, Deserialize, Debug, Clone, Default)] pub struct VulkanDriverInfo { pub version: u32, pub name: Option,