12: move temp test files to subdirectory

picodata · Dec 20, 2024 · 3126858 · 3126858
1 parent 4955325
commit 3126858
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 /target
-tmp
-local
+/local
+/tests/tmp/*
+!/tests/tmp/.keep
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -34,3 +34,6 @@ log = "0.4.22"
 [[bin]]
 name = "cargo-pike"
 path = "src/main.rs"
+
+[dev-dependencies]
+constcat = "0.5.1"
diff --git a/tests/helpers/mod.rs b/tests/helpers/mod.rs
@@ -1,3 +1,4 @@
+use constcat::concat;
 use log::info;
 use std::ffi::OsStr;
 use std::io::{BufRead, BufReader, Write};
@@ -10,8 +11,8 @@ use std::{
     time::{Duration, Instant},
 };
 
-pub const PLUGIN_DIR: &str = "./tests/test_plugin/";
-pub const TESTS_DIR: &str = "./tests";
+pub const TESTS_DIR: &str = "./tests/tmp/";
+pub const PLUGIN_DIR: &str = concat!(TESTS_DIR, "test_plugin/");
 
 pub struct Cluster {}
 
@@ -164,7 +165,7 @@ pub fn await_picodata_admin(timeout: Duration) -> Result<Child, std::io::Error>
 
         let picodata_admin = Command::new("picodata")
             .arg("admin")
-            .arg("./tests/test_plugin/tmp/cluster/i_1/admin.sock")
+            .arg(PLUGIN_DIR.to_string() + "tmp/cluster/i_1/admin.sock")
             .stdin(Stdio::piped())
             .stdout(Stdio::piped())
             .spawn();

diff --git a/tests/tmp/.keep b/tests/tmp/.keep