public inbox for pve-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Fiona Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH v2 proxmox 3/5] apt: tests: create temporary test directories in CARGO_TARGET_TMPDIR
Date: Fri,  2 Jun 2023 10:48:22 +0200	[thread overview]
Message-ID: <20230602084824.54967-3-f.ebner@proxmox.com> (raw)
In-Reply-To: <20230602084824.54967-1-f.ebner@proxmox.com>

Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---

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





  parent reply	other threads:[~2023-06-02  8:48 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-06-02  8:48 [pve-devel] [PATCH v2 proxmox 1/5] apt: drop older Ceph standard repositories Fiona Ebner
2023-06-02  8:48 ` [pve-devel] [PATCH v2 proxmox 2/5] apt: split Ceph main repository into no-subscription and enterprise Fiona Ebner
2023-06-02  8:48 ` Fiona Ebner [this message]
2023-06-02  8:48 ` [pve-devel] [PATCH v2 proxmox 4/5] apt: tests: code cleanup to avoid useless vector Fiona Ebner
2023-06-02  8:48 ` [pve-devel] [PATCH v2 proxmox 5/5] apt: tests: add tests for Ceph Quincy repository detection on Bookworm Fiona Ebner
2023-06-04 16:54 ` [pve-devel] applied: [PATCH v2 proxmox 1/5] apt: drop older Ceph standard repositories Thomas Lamprecht

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230602084824.54967-3-f.ebner@proxmox.com \
    --to=f.ebner@proxmox.com \
    --cc=pve-devel@lists.proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal