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 F325C1FF15C for ; Wed, 21 Aug 2024 11:41:00 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 2C1DF15F3A; Wed, 21 Aug 2024 11:40:42 +0200 (CEST) From: Christoph Heiss To: pve-devel@lists.proxmox.com Date: Wed, 21 Aug 2024 11:40:16 +0200 Message-ID: <20240821094023.667806-15-c.heiss@proxmox.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240821094023.667806-1-c.heiss@proxmox.com> References: <20240821094023.667806-1-c.heiss@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.032 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 SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH installer v3 14/20] auto-installer: tests: replace `PathBuf` parameters with `AsRef` 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" Signed-off-by: Christoph Heiss --- Changes v2 -> v3: * no changes Changes v1 -> v2: * new patch, suggestion by Stefan proxmox-auto-installer/tests/parse-answer.rs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/proxmox-auto-installer/tests/parse-answer.rs b/proxmox-auto-installer/tests/parse-answer.rs index 72bddaa..0e5d6e7 100644 --- a/proxmox-auto-installer/tests/parse-answer.rs +++ b/proxmox-auto-installer/tests/parse-answer.rs @@ -18,7 +18,7 @@ fn get_test_resource_path() -> Result { .join("tests/resources")) } -fn get_answer(path: PathBuf) -> Result { +fn get_answer(path: impl AsRef) -> Result { let answer_raw = std::fs::read_to_string(path).unwrap(); let answer: answer::Answer = toml::from_str(&answer_raw) .map_err(|err| format!("error parsing answer.toml: {err}")) @@ -27,11 +27,12 @@ fn get_answer(path: PathBuf) -> Result { Ok(answer) } -pub fn setup_test_basic(path: &Path) -> (SetupInfo, LocaleInfo, RuntimeInfo, UdevInfo) { - let (installer_info, locale_info, mut runtime_info) = load_installer_setup_files(path).unwrap(); +pub fn setup_test_basic(path: impl AsRef) -> (SetupInfo, LocaleInfo, RuntimeInfo, UdevInfo) { + let (installer_info, locale_info, mut runtime_info) = + load_installer_setup_files(&path).unwrap(); let udev_info: UdevInfo = { - let mut path = path.to_path_buf(); + let mut path = path.as_ref().to_path_buf(); path.push("run-env-udev.json"); read_json(&path) -- 2.45.2 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel