From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 156FC1FF16E for ; Mon, 9 Dec 2024 13:46:36 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 4054B1C94; Mon, 9 Dec 2024 13:46:40 +0100 (CET) From: Christoph Heiss To: pve-devel@lists.proxmox.com Date: Mon, 9 Dec 2024 13:45:54 +0100 Message-ID: <20241209124601.1272122-2-c.heiss@proxmox.com> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241209124601.1272122-1-c.heiss@proxmox.com> References: <20241209124601.1272122-1-c.heiss@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.028 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH installer 1/6] tui: options: simplify unit-test setup X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" We already have `SetupInfo::mocked()` since commit c3c9282 ("common: add mocked variants for setup and ISO related info structs"), so use that. Signed-off-by: Christoph Heiss --- proxmox-tui-installer/src/options.rs | 26 +++----------------------- 1 file changed, 3 insertions(+), 23 deletions(-) diff --git a/proxmox-tui-installer/src/options.rs b/proxmox-tui-installer/src/options.rs index e2116d2..8c882b7 100644 --- a/proxmox-tui-installer/src/options.rs +++ b/proxmox-tui-installer/src/options.rs @@ -84,35 +84,15 @@ impl InstallerOptions { mod tests { use super::*; use proxmox_installer_common::{ - setup::{ - Dns, Gateway, Interface, InterfaceState, IsoInfo, IsoLocations, NetworkInfo, - ProductConfig, ProxmoxProduct, Routes, SetupInfo, - }, + setup::{Dns, Gateway, Interface, InterfaceState, NetworkInfo, Routes, SetupInfo}, utils::{CidrAddress, Fqdn}, }; + use std::collections::BTreeMap; use std::net::{IpAddr, Ipv4Addr}; - use std::{collections::BTreeMap, path::PathBuf}; - - fn dummy_setup_info() -> SetupInfo { - SetupInfo { - config: ProductConfig { - fullname: "Proxmox VE".to_owned(), - product: ProxmoxProduct::PVE, - enable_btrfs: true, - }, - iso_info: IsoInfo { - release: String::new(), - isorelease: String::new(), - }, - locations: IsoLocations { - iso: PathBuf::new(), - }, - } - } #[test] fn network_options_from_setup_network_info() { - let setup = dummy_setup_info(); + let setup = SetupInfo::mocked(); let mut interfaces = BTreeMap::new(); interfaces.insert( -- 2.47.0 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel