tests: unify scratch dir logic

1 files changed, 4 insertions, 11 deletions

diff --git a/src/config/file.rs b/src/config/file.rs
index 114d452..fbbd89a 100644
--- a/src/config/file.rs
+++ b/src/config/file.rs
@@ -169,6 +169,7 @@ fn flatten(
 #[cfg(test)]
 mod tests {
     use super::*;
+    use crate::files::scratch_dir;
     use serde_json::json;
 
     fn write(dir: &Path, name: &str, text: &str) -> PathBuf {
@@ -177,17 +178,9 @@ mod tests {
         path
     }
 
-    fn scratch(name: &str) -> PathBuf {
-        let dir =
-            std::env::temp_dir().join(format!("continuum-config-{name}-{}", std::process::id()));
-        let _ = std::fs::remove_dir_all(&dir);
-        std::fs::create_dir_all(&dir).unwrap();
-        dir
-    }
-
     #[test]
     fn includes_tables_and_importers() {
-        let dir = scratch("includes");
+        let dir = scratch_dir("config-includes");
         write(&dir, "key-path", "/run/secrets/swarm-key\n");
         write(
             &dir,
@@ -218,7 +211,7 @@ mod tests {
 
     #[test]
     fn unset() {
-        let dir = scratch("unset");
+        let dir = scratch_dir("config-unset");
         write(
             &dir,
             "base.toml",
@@ -246,7 +239,7 @@ mod tests {
 
     #[test]
     fn errors() {
-        let dir = scratch("errors");
+        let dir = scratch_dir("config-errors");
         let unknown = write(&dir, "unknown.toml", "nieghbours = 3\n");
         assert!(load(&unknown).is_err());
         let cycle = write(&dir, "cycle.toml", "include = [\"cycle.toml\"]\n");