From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id F32289CECC for ; Fri, 2 Jun 2023 10:48:28 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id DB1E92743F for ; Fri, 2 Jun 2023 10:48:28 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Fri, 2 Jun 2023 10:48:27 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 8119748335 for ; Fri, 2 Jun 2023 10:48:27 +0200 (CEST) From: Fiona Ebner To: pve-devel@lists.proxmox.com Date: Fri, 2 Jun 2023 10:48:22 +0200 Message-Id: <20230602084824.54967-3-f.ebner@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230602084824.54967-1-f.ebner@proxmox.com> References: <20230602084824.54967-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.048 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 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [repositories.rs] Subject: [pve-devel] [PATCH v2 proxmox 3/5] apt: tests: create temporary test directories in CARGO_TARGET_TMPDIR 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: , X-List-Received-Date: Fri, 02 Jun 2023 08:48:29 -0000 Signed-off-by: Fiona Ebner --- New in v2. proxmox-apt/tests/repositories.rs | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/proxmox-apt/tests/repositories.rs b/proxmox-apt/tests/repositories.rs index 4b3c9de..6319a62 100644 --- a/proxmox-apt/tests/repositories.rs +++ b/proxmox-apt/tests/repositories.rs @@ -19,15 +19,11 @@ fn test_parse_write() -> Result<(), Error> { fn test_parse_write_dir(read_dir: &str) -> Result<(), Error> { let test_dir = std::env::current_dir()?.join("tests"); + let tmp_dir = PathBuf::from(env!("CARGO_TARGET_TMPDIR").to_string()); let read_dir = test_dir.join(read_dir); - let write_dir = test_dir.join("sources.list.d.actual"); + let write_dir = tmp_dir.join("sources.list.d.actual"); let expected_dir = test_dir.join("sources.list.d.expected"); - if write_dir.is_dir() { - std::fs::remove_dir_all(&write_dir) - .map_err(|err| format_err!("unable to remove dir {:?} - {}", write_dir, err))?; - } - std::fs::create_dir_all(&write_dir) .map_err(|err| format_err!("unable to create dir {:?} - {}", write_dir, err))?; @@ -66,6 +62,7 @@ fn test_parse_write_dir(read_dir: &str) -> Result<(), Error> { expected_count += 1; let expected_path = entry?.path(); + let actual_path = write_dir.join(expected_path.file_name().unwrap()); let expected_contents = std::fs::read(&expected_path) @@ -91,13 +88,9 @@ fn test_parse_write_dir(read_dir: &str) -> Result<(), Error> { #[test] fn test_digest() -> Result<(), Error> { let test_dir = std::env::current_dir()?.join("tests"); + let tmp_dir = PathBuf::from(env!("CARGO_TARGET_TMPDIR").to_string()); let read_dir = test_dir.join("sources.list.d"); - let write_dir = test_dir.join("sources.list.d.digest"); - - if write_dir.is_dir() { - std::fs::remove_dir_all(&write_dir) - .map_err(|err| format_err!("unable to remove dir {:?} - {}", write_dir, err))?; - } + let write_dir = tmp_dir.join("sources.list.d.digest"); std::fs::create_dir_all(&write_dir) .map_err(|err| format_err!("unable to create dir {:?} - {}", write_dir, err))?; -- 2.39.2