refactor tests

RussPalms · Aug 15, 2024 · 2cdb9a6 · 2cdb9a6
1 parent 1357b7b
commit 2cdb9a6
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -68,7 +68,7 @@ test_end_to_end: clean_test_end_to_end release
 
 	sudo mkdir /etc/ruroco
 	sudo mv ./ruroco_public.pem /etc/ruroco
-	sudo cp ./tests/config_end_to_end.toml /etc/ruroco/config.toml
+	sudo cp ./tests/files/config_end_to_end.toml /etc/ruroco/config.toml
 	sudo chmod 400 /etc/ruroco/ruroco_public.pem
 
 	sudo chown -R ruroco:ruroco /tmp/ruroco_test

diff --git a/tests/commander_test.rs b/tests/commander_test.rs
@@ -21,6 +21,7 @@ mod tests {
         let path = env::current_dir()
             .unwrap_or(PathBuf::from("/tmp"))
             .join("tests")
+            .join("files")
             .join("config_invalid.toml");
 
         let result = Commander::create_from_path(path);
@@ -49,8 +50,11 @@ mod tests {
             String::from("touch /tmp/ruroco_test/start.test /tmp/ruroco_test/stop.test"),
         );
 
-        let path =
-            env::current_dir().unwrap_or(PathBuf::from("/tmp")).join("tests").join("config.toml");
+        let path = env::current_dir()
+            .unwrap_or(PathBuf::from("/tmp"))
+            .join("tests")
+            .join("files")
+            .join("config.toml");
 
         assert_eq!(
             Commander::create_from_path(path),

diff --git a/tests/config.toml → tests/files/config.toml b/tests/config.toml → tests/files/config.toml
diff --git a/tests/config_end_to_end.toml → tests/files/config_end_to_end.toml b/tests/config_end_to_end.toml → tests/files/config_end_to_end.toml
diff --git a/tests/config_invalid.toml → tests/files/config_invalid.toml b/tests/config_invalid.toml → tests/files/config_invalid.toml
diff --git a/tests/server_test.rs b/tests/server_test.rs
@@ -24,7 +24,7 @@ mod tests {
     #[test]
     fn test_create_from_path() {
         let tests_dir_path = env::current_dir().unwrap_or(PathBuf::from("/tmp")).join("tests");
-        let conf_path = tests_dir_path.join("config.toml");
+        let conf_path = tests_dir_path.join("files").join("config.toml");
         let conf_dir_path = tests_dir_path.join("conf_dir");
 
         let res_path = Server::create_from_path(conf_path).unwrap();
@@ -43,6 +43,7 @@ mod tests {
         let path = env::current_dir()
             .unwrap_or(PathBuf::from("/tmp"))
             .join("tests")
+            .join("files")
             .join("config_invalid.toml");
 
         let result = Server::create_from_path(path);