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)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id C405F9D9B3 for ; Mon, 5 Jun 2023 17:27:20 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 99AC529C70 for ; Mon, 5 Jun 2023 17:26:50 +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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Mon, 5 Jun 2023 17:26:49 +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 220D5489F1 for ; Mon, 5 Jun 2023 17:26:49 +0200 (CEST) From: Fiona Ebner To: pve-devel@lists.proxmox.com Date: Mon, 5 Jun 2023 17:26:46 +0200 Message-Id: <20230605152646.178768-1-f.ebner@proxmox.com> X-Mailer: git-send-email 2.39.2 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 - Subject: [pve-devel] [PATCH proxmox] apt: tests: remove output directories before running test 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: Mon, 05 Jun 2023 15:27:20 -0000 I blindly assumed that cargo would re-create the TMPDIR before each test run, but that doesn't seem to be the case and the test_digest test now fails the second time when running 'cargo test' twice. So partially revert 9b7c533 ("apt: tests: create temporary test directories in CARGO_TARGET_TMPDIR") and re-introduce the remove-before-test logic. Fixes: 9b7c533 ("apt: tests: create temporary test directories in CARGO_TARGET_TMPDIR") Signed-off-by: Fiona Ebner --- proxmox-apt/tests/repositories.rs | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/proxmox-apt/tests/repositories.rs b/proxmox-apt/tests/repositories.rs index be6aaff..64ecdbb 100644 --- a/proxmox-apt/tests/repositories.rs +++ b/proxmox-apt/tests/repositories.rs @@ -24,6 +24,11 @@ fn test_parse_write_dir(read_dir: &str) -> Result<(), Error> { 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))?; @@ -92,6 +97,11 @@ fn test_digest() -> Result<(), Error> { let read_dir = test_dir.join("sources.list.d"); let write_dir = tmp_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))?; + } + std::fs::create_dir_all(&write_dir) .map_err(|err| format_err!("unable to create dir {:?} - {}", write_dir, err))?; -- 2.39.2