Testing utility: TempTedgeDir POC (#1148)

* temp tedge dir poc

Signed-off-by: initard <solo@softwareag.com>

* renaming crate and removing TedgeChildTempDir

- renamed the crate to tedge_test_utils
- removed TedgeChildTempDir as TempTedgeDir already had the same
  functions

Signed-off-by: Alex Solomes <alex.solomes@softwareag.com>

* changing agent.rs tests to use TempTedgeDir

- changing agent.rs to use TempTedgeDir
- un-ignoring a test to check if agent restart creates a file in the
  right place

Signed-off-by: Alex Solomes <alex.solomes@softwareag.com>

* changing tedge_mapper tests to use TempTedgeDir

Signed-off-by: Alex Solomes <alex.solomes@softwareag.com>

* changing tedge_config tests to use TempTedgeDir

Signed-off-by: Alex Solomes <alex.solomes@softwareag.com>

* changing c8y_configuration_plugin tests to use TempTedgeDir

Signed-off-by: Alex Solomes <alex.solomes@softwareag.com>

* changing tedge_apama_plugin tests to use TempTedgeDir

Signed-off-by: Alex Solomes <alex.solomes@softwareag.com>

* changing logged_command tests to use TempTedgeDir

Signed-off-by: Alex Solomes <alex.solomes@softwareag.com>

* adding another method to TempTedgeDir

Signed-off-by: initard <solo@softwareag.com>

Co-authored-by: initard <solo@softwareag.com>

21 files changed, 421 insertions, 211 deletions

diff --git a/Cargo.lock b/Cargo.lock
index 628f74d7..67a27101 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -406,8 +406,8 @@ dependencies = [
  "serde_json",
  "serial_test",
  "tedge_config",
+ "tedge_test_utils",
  "tedge_utils",
- "tempfile",
  "test-case",
  "thiserror",
  "tokio",
@@ -1528,7 +1528,7 @@ dependencies = [
  "async-trait",
  "log",
  "serial_test",
- "tempfile",
+ "tedge_test_utils",
  "test-case",
  "thiserror",
  "tokio",
@@ -2923,9 +2923,9 @@ dependencies = [
  "serde_json",
  "serial_test",
  "tedge_config",
+ "tedge_test_utils",
  "tedge_users",
  "tedge_utils",
- "tempfile",
  "thiserror",
  "time",
  "tokio",
@@ -2940,7 +2940,7 @@ version = "0.7.1"
 dependencies = [
  "clap 3.1.18",
  "roxmltree",
- "tempfile",
+ "tedge_test_utils",
  "thiserror",
  "zip",
 ]
@@ -2968,6 +2968,7 @@ dependencies = [
  "assert_matches",
  "certificate",
  "serde",
+ "tedge_test_utils",
  "tedge_users",
  "tedge_utils",
  "tempfile",
@@ -3015,9 +3016,9 @@ dependencies = [
  "serde_json",
  "serial_test",
  "tedge_config",
+ "tedge_test_utils",
  "tedge_users",
  "tedge_utils",
- "tempfile",
  "test-case",
  "thin_edge_json",
  "thiserror",
@@ -3029,6 +3030,15 @@ dependencies = [
 ]
 
 [[package]]
+name = "tedge_test_utils"
+version = "0.7.1"
+dependencies = [
+ "anyhow",
+ "tempfile",
+ "toml",
+]
+
+[[package]]
 name = "tedge_users"
 version = "0.7.1"
 dependencies = [
diff --git a/crates/common/logged_command/Cargo.toml b/crates/common/logged_command/Cargo.toml
index 2e026e9d..9a9b9442 100644
--- a/crates/common/logged_command/Cargo.toml
+++ b/crates/common/logged_command/Cargo.toml
@@ -16,5 +16,5 @@ tokio = { version = "1.8", features = [ "fs", "io-util", "macros", "process", "r
 anyhow = "1.0"
 assert_matches = "1.5"
 serial_test = "0.6"
-tempfile = "3.2"
+tedge_test_utils = { path = "../../tests/tedge_test_utils" }
 test-case = "2.0"
diff --git a/crates/common/logged_command/src/logged_command.rs b/crates/common/logged_command/src/logged_command.rs
index ef40ab7d..e276b495 100644
--- a/crates/common/logged_command/src/logged_command.rs
+++ b/crates/common/logged_command/src/logged_command.rs
@@ -141,16 +141,17 @@ impl LoggedCommand {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use tempfile::*;
+    use tedge_test_utils::fs::TempTedgeDir;
     use tokio::fs::File;
 
     #[tokio::test]
     async fn on_execute_are_logged_command_line_exit_status_stdout_and_stderr(
     ) -> Result<(), anyhow::Error> {
         // Prepare a log file
-        let tmp_dir = TempDir::new()?;
-        let log_file_path = tmp_dir.path().join("operation.log");
-        let log_file = File::create(log_file_path.clone()).await?;
+        let tmp_dir = TempTedgeDir::new();
+        let tmp_file = tmp_dir.file("operation.log");
+        let log_file_path = tmp_file.path();
+        let log_file = File::create(&log_file_path).await?;
         let mut logger = BufWriter::new(log_file);
 
         // Prepare a command
@@ -160,7 +161,7 @@ mod tests {
         // Execute the command with logging
         let _ = command.execute(&mut logger).await;
 
-        let log_content = String::from_utf8(std::fs::read(&log_file_path)?)?;
+        let log_content = String::from_utf8(std::fs::read(log_file_path)?)?;
         assert_eq!(
             log_content,
             r#"----- $ echo "Hello" "World!"
@@ -180,9 +181,10 @@ EOF
     #[tokio::test]
     async fn on_execute_with_error_stderr_is_logged() -> Result<(), anyhow::Error> {
         // Prepare a log file
-        let tmp_dir = TempDir::new()?;
-        let log_file_path = tmp_dir.path().join("operation.log");
-        let log_file = File::create(log_file_path.clone()).await?;
+        let tmp_dir = TempTedgeDir::new();
+        let tmp_file = tmp_dir.file("operation.log");
+        let log_file_path = tmp_file.path();
+        let log_file = File::create(&log_file_path).await?;
         let mut logger = BufWriter::new(log_file);
 
         // Prepare a command that triggers some content on stderr
@@ -213,9 +215,10 @@ EOF
     #[tokio::test]
     async fn on_execution_error_are_logged_command_line_and_error() -> Result<(), anyhow::Error> {
         // Prepare a log file
-        let tmp_dir = TempDir::new()?;
-        let log_file_path = tmp_dir.path().join("operation.log");
-        let log_file = File::create(log_file_path.clone()).await?;
+        let tmp_dir = TempTedgeDir::new();
+        let tmp_file = tmp_dir.file("operation.log");
+        let log_file_path = tmp_file.path();
+        let log_file = File::create(&log_file_path).await?;
         let mut logger = BufWriter::new(log_file);
 
         // Prepare a command that cannot be executed
diff --git a/crates/common/tedge_config/Cargo.toml b/crates/common/tedge_config/Cargo.toml
index d71f83d1..9b73955f 100644
--- a/crates/common/tedge_config/Cargo.toml
+++ b/crates/common/tedge_config/Cargo.toml
@@ -17,4 +17,4 @@ url = "2.2"
 
 [dev-dependencies]
 assert_matches = "1.5"
-tempfile = "3.2"
+tedge_test_utils = { path = "../../tests/tedge_test_utils" }
diff --git a/crates/common/tedge_config/tests/test_tedge_config.rs b/crates/common/tedge_config/tests/test_tedge_config.rs
index 86c89615..1dc3aa4f 100644
--- a/crates/common/tedge_config/tests/test_tedge_config.rs
+++ b/crates/common/tedge_config/tests/test_tedge_config.rs
@@ -3,7 +3,7 @@ use std::convert::TryFrom;
 use std::io::Write;
 use std::net::{IpAddr, Ipv4Addr};
 use tedge_config::*;
-use tempfile::TempDir;
+use tedge_test_utils::fs::TempTedgeDir;
 
 #[test]
 fn test_parse_config_with_all_values() -> Result<(), TEdgeConfigError> {
@@ -878,11 +878,10 @@ cert_path = "/path/to/cert"
     Ok(())
 }
 
-fn create_temp_tedge_config(content: &str) -> std::io::Result<(TempDir, TEdgeConfigLocation)> {
-    let dir = TempDir::new()?;
+fn create_temp_tedge_config(content: &str) -> std::io::Result<(TempTedgeDir, TEdgeConfigLocation)> {
+    let dir = TempTedgeDir::new();
+    dir.file("tedge.toml").with_raw_content(content);
     let config_location = TEdgeConfigLocation::from_custom_root(dir.path());
-    let mut file = std::fs::File::create(config_location.tedge_config_file_path())?;
-    file.write_all(content.as_bytes())?;
     Ok((dir, config_location))
 }
 
diff --git a/crates/core/tedge_agent/Cargo.toml b/crates/core/tedge_agent/Cargo.toml
index 5fd8177e..4197ad17 100644
--- a/crates/core/tedge_agent/Cargo.toml
+++ b/crates/core/tedge_agent/Cargo.toml
@@ -50,6 +50,6 @@ mqtt_tests = { path = "../../tests/mqtt_tests" }
 predicates = "2.1"
 tedge_users = { path = "../../common/tedge_users"}
 tedge_utils = { path = "../../common/tedge_utils"}
-tempfile = "3.2"
+tedge_test_utils = { path = "../../tests/tedge_test_utils"}
 tokio-test = "0.4"
 serial_test = "0.6"
diff --git a/crates/core/tedge_agent/src/agent.rs b/crates/core/tedge_agent/src/agent.rs
index 755fc7af..8fe3e18a 100644
--- a/crates/core/tedge_agent/src/agent.rs
+++ b/crates/core/tedge_agent/src/agent.rs
@@ -19,7 +19,7 @@ use plugin_sm::{
     plugin_manager::{ExternalPlugins, Plugins},
 };
 use serde_json::json;
-use std::process;
+use std::process::{self, Command};
 use std::{convert::TryInto, fmt::Debug, path::PathBuf, sync::Arc};
 use tedge_config::{
     ConfigRepository, ConfigSettingAccessor, ConfigSettingAccessorStringExt, LogPathSetting,
@@ -555,20 +555,17 @@ impl SmAgent {
             .await?;
         let () = restart_operation::create_slash_run_file(&self.config.run_dir)?;
 
-        let _process_result = std::process::Command::new("sudo").arg("sync").status();
-        // state = "Restarting"
-        match std::process::Command::new("sudo")
-            .arg(INIT_COMMAND)
-            .arg("6")
-            .status()
-        {
-            Ok(process_status) => {
-                if !process_status.success() {
-                    return Err(AgentError::CommandFailed);
+        let command_vec = get_restart_operation_commands();
+        for mut command in command_vec {
+            match command.status() {
+                Ok(status) => {
+                    if !status.success() {
+                        return Err(AgentError::CommandFailed);
+                    }
+                }
+                Err(e) => {
+                    return Err(AgentError::FromIo(e));
                 }
-            }
-            Err(e) => {
-                return Err(AgentError::FromIo(e));
             }
         }
 
@@ -631,6 +628,30 @@ impl SmAgent {
     }
 }
 
+#[cfg(test)]
+fn get_restart_operation_commands() -> Vec<Command> {
+    let mut vec = vec![];
+    // running `echo 6` with no sudo
+    let mut command = std::process::Command::new(INIT_COMMAND);
+    command.arg("6");
+    vec.push(command);
+    vec
+}
+
+#[cfg(not(test))]
+fn get_restart_operation_commands() -> Vec<Command> {
+    let mut vec = vec![];
+    // sync first
+    let mut sync_command = std::process::Command::new("sudo");
+    sync_command.arg("sync");
+    vec.push(sync_command);
+    // running `sudo init 6`
+    let mut command = std::process::Command::new("sudo");
+    command.arg(INIT_COMMAND).arg("6");
+    vec.push(command);
+    vec
+}
+
 fn get_default_plugin(
     config_location: &TEdgeConfigLocation,
 ) -> Result<Option<SoftwareType>, AgentError> {
@@ -643,7 +664,6 @@ fn get_default_plugin(
 #[cfg(test)]
 mod tests {
 
-    use std::io::Write;
     use std::path::PathBuf;
 
     use assert_json_diff::assert_json_include;
@@ -651,9 +671,10 @@ mod tests {
 
     use super::*;
 
+    use tedge_test_utils::fs::TempTedgeDir;
+
     const SLASH_RUN_PATH_TEDGE_AGENT_RESTART: &str = "tedge_agent/tedge_agent_restart";
 
-    #[ignore]
     #[tokio::test]
     async fn check_agent_restart_file_is_created() -> Result<(), AgentError> {
         assert_eq!(INIT_COMMAND, "echo");
@@ -666,19 +687,19 @@ mod tests {
         .unwrap();
 
         // calling handle_restart_operation should create a file in /run/tedge_agent_restart
-        let (_, mut output_stream) = mqtt_tests::output_stream();
+        let (_output, mut output_stream) = mqtt_tests::output_stream();
         let response_topic_restart =
             Topic::new(RestartOperationResponse::topic_name()).expect("Invalid topic");
         let () = agent
             .handle_restart_operation(&mut output_stream, &response_topic_restart)
             .await?;
-        assert!(
-            std::path::Path::new(&dir.path().join(SLASH_RUN_PATH_TEDGE_AGENT_RESTART)).exists()
-        );
-
-        // removing the file
-        let () =
-            std::fs::remove_file(&dir.path().join(SLASH_RUN_PATH_TEDGE_AGENT_RESTART)).unwrap();
+        assert!(std::path::Path::new(
+            &dir.temp_dir
+                .path()
+                .join("run/")
+                .join(SLASH_RUN_PATH_TEDGE_AGENT_RESTART)
+        )
+        .exists());
 
         Ok(())
     }
@@ -689,39 +710,26 @@ mod tests {
         Message::new(&topic, payload)
     }
 
-    fn create_temp_tedge_config() -> std::io::Result<(tempfile::TempDir, TEdgeConfigLocation)> {
-        let dir = tempfile::TempDir::new()?;
-
-        let dir_path = dir.path().join(".agent");
-        std::fs::create_dir(&dir_path).unwrap();
-
-        let () = {
-            let _file = std::fs::File::create(dir.path().join(".agent/current-operation")).unwrap();
-        };
-
-        let dir_path = dir.path().join("sm-plugins");
-        std::fs::create_dir(dir_path).unwrap();
-
-        let dir_path = dir.path().join("lock");
-        std::fs::create_dir(dir_path).unwrap();
-
-        let dir_path = dir.path().join("logs");
-        std::fs::create_dir(dir_path).unwrap();
-
+    fn create_temp_tedge_config() -> std::io::Result<(TempTedgeDir, TEdgeConfigLocation)> {
+        let ttd = TempTedgeDir::new();
+        ttd.dir(".agent").file("current-operation");
+        ttd.dir("sm-plugins");
+        ttd.dir("logs");
+        ttd.dir("run").dir("tedge_agent");
+        ttd.dir("run").dir("lock");
         let toml_conf = &format!(
             r#"
             [logs]
             path = '{}'
             [run]
             path = '{}'"#,
-            &dir.path().join("logs").to_str().unwrap(),
-            &dir.path().to_str().unwrap()
+            &ttd.temp_dir.path().join("logs").to_str().unwrap(),
+            &ttd.temp_dir.path().join("run").to_str().unwrap()
         );
+        ttd.file("tedge.toml").with_raw_content(toml_conf);
 
-        let config_location = TEdgeConfigLocation::from_custom_root(dir.path());
-        let mut file = std::fs::File::create(config_location.tedge_config_file_path())?;
-        file.write_all(toml_conf.as_bytes())?;
-        Ok((dir, config_location))
+        let config_location = TEdgeConfigLocation::from_custom_root(ttd.temp_dir.path());
+        Ok((ttd, config_location))
     }
 
     #[tokio::test]
@@ -752,7 +760,7 @@ mod tests {
 
             let plugins = Arc::new(Mutex::new(
                 ExternalPlugins::open(
-                    PathBuf::from(&dir.path()).join("sm-plugins"),
+                    PathBuf::from(&dir.temp_dir.path()).join("sm-plugins"),
                     get_default_plugin(&agent.config.config_location).unwrap(),
                     Some("sudo".into()),
                 )
@@ -796,7 +804,7 @@ mod tests {
 
             let plugins = Arc::new(Mutex::new(
                 ExternalPlugins::open(
-                    PathBuf::from(&dir.path()).join("sm-plugins"),
+                    PathBuf::from(&dir.temp_dir.path()).join("sm-plugins"),
                     get_default_plugin(&agent.config.config_location).unwrap(),
                     Some("sudo".into()),
                 )
diff --git a/crates/core/tedge_agent/src/state.rs b/crates/core/tedge_agent/src/state.rs
index b7819448..36b378dd 100644
--- a/crates/core/tedge_agent/src/state.rs
+++ b/crates/core/tedge_agent/src/state.rs
@@ -123,28 +123,26 @@ mod tests {
         StateRepository, StateStatus,
     };
 
-    use tempfile::tempdir;
+    use tedge_test_utils::fs::TempTedgeDir;
 
     #[tokio::test]
     async fn agent_state_repository_not_exists_fail() {
-        let temp_dir = tempdir().unwrap();
-        let repo = AgentStateRepository::new(temp_dir.into_path());
+        let temp_dir = TempTedgeDir::new();
+        let repo = AgentStateRepository::new(temp_dir.path().to_path_buf());
 
         repo.load().await.unwrap_err();
     }
 
     #[tokio::test]
     async fn agent_state_repository_exists_loads_some() {
-        let temp_dir = tempdir().unwrap();
-
-        let _ = tokio::fs::create_dir(temp_dir.path().join(".agent/")).await;
-        let destination_path = temp_dir.path().join(".agent/current-operation");
-
+        let temp_dir = TempTedgeDir::new();
         let content = "operation_id = \'1234\'\noperation = \"list\"";
+        temp_dir
+            .dir(".agent")
+            .file("current-operation")
+            .with_raw_content(content);
 
-        let _ = tokio::fs::write(destination_path, content.as_bytes()).await;
-
-        let repo = AgentStateRepository::new(temp_dir.into_path());
+        let repo = AgentStateRepository::new(temp_dir.path().to_path_buf());
 
         let data = repo.load().await.unwrap();
         assert_eq!(
@@ -158,16 +156,14 @@ mod tests {
 
     #[tokio::test]
     async fn agent_state_repository_exists_loads_some_restart_variant() {
-        let temp_dir = tempdir().unwrap();
-
-        let _ = tokio::fs::create_dir(temp_dir.path().join(".agent/")).await;
-        let destination_path = temp_dir.path().join(".agent/current-operation");
-
+        let temp_dir = TempTedgeDir::new();
         let content = "operation_id = \'1234\'\noperation = \"Restarting\"";
+        temp_dir
+            .dir(".agent")
+            .file("current-operation")
+            .with_raw_content(content);
 
-        let _ = tokio::fs::write(destination_path, content.as_bytes()).await;
-
-        let repo = AgentStateRepository::new(temp_dir.into_path());
+        let repo = AgentStateRepository::new(temp_dir.path().to_path_buf());
 
         let data = repo.load().await.unwrap();
         assert_eq!(
@@ -181,16 +177,14 @@ mod tests {
 
     #[tokio::test]
     async fn agent_state_repository_exists_loads_none() {
-        let temp_dir = tempdir().unwrap();
-
-        let _ = tokio::fs::create_dir(temp_dir.path().join(".agent/")).await;
-        let destination_path = temp_dir.path().join(".agent/current-operation");
-
+        let temp_dir = TempTedgeDir::new();
         let content = "";
+        temp_dir
+            .dir(".agent")
+            .file("current-operation")
+            .with_raw_content(content);
 
-        let _ = tokio::fs::write(destination_path, content.as_bytes()).await;
-
-        let repo = AgentStateRepository::new(temp_dir.into_path());
+        let repo = AgentStateRepository::new(temp_dir.path().to_path_buf());
 
         let data = repo.load().await.unwrap();
         assert_eq!(
@@ -204,12 +198,10 @@ mod tests {
 
     #[tokio::test]
     async fn agent_state_repository_exists_store() {
-        let temp_dir = tempdir().unwrap();
+        let temp_dir = TempTedgeDir::new();
+        temp_dir.dir(".agent").file("current-operation");
 
-        let _ = tokio::fs::create_dir(temp_dir.path().join(".agent/")).await;
-        let destination_path = temp_dir.path().join(".agent/current-operation");
-
-        let repo = AgentStateRepository::new(temp_dir.into_path());
+        let repo = AgentStateRepository::new(temp_dir.path().to_path_buf());
 
         repo.store(&State {
             operation_id: Some("1234".into()),
@@ -218,7 +210,12 @@ mod tests {
         .await
         .unwrap();
 
-        let data = tokio::fs::read_to_string(destination_path).await.unwrap();
+        let data = tokio::fs::read_to_string(&format!(
+            "{}/.agent/current-operation",
+            &temp_dir.temp_dir.path().to_str().unwrap()
+        ))
+        .await
+        .unwrap();
 
         assert_eq!(data, "operation_id = \'1234\'\noperation = \'list\'\n");
     }
diff --git a/crates/core/tedge_mapper/Cargo.toml b/crates/core/tedge_mapper/Cargo.toml
index a7876bdf..d7464294 100644
--- a/crates/core/tedge_mapper/Cargo.toml
+++ b/crates/core/tedge_mapper/Cargo.toml
@@ -64,7 +64,7 @@ mockito = "0.31"
 mqtt_tests = { path = "../../tests/mqtt_tests" }
 serde_json = "1.0"
 serial_test = "0.6"
-tempfile = "3.2"
+tedge_test_utils = { path = "../../tests/tedge_test_utils" }
 test-case = "2.0"
 time = { version = "0.3", features = ["macros"] }
 tokio-test = "0.4"
diff --git a/crates/core/tedge_mapper/src/c8y/converter.rs b/crates/core/tedge_mapper/src/c8y/converter.rs
index a7468ebe..9ec58cb0 100644
--- a/crates/core/tedge_mapper/src/c8y/converter.rs
+++ b/crates/core/tedge_mapper/src/c8y/converter.rs
@@ -837,11 +837,11 @@ pub fn get_child_id_from_topic(topic: &str) -> Result<Option<String>, Conversion
 #[cfg(test)]
 mod tests {
     use plugin_sm::operation_logs::OperationLogs;
-    use tempfile::TempDir;
+    use tedge_test_utils::fs::TempTedgeDir;
 
     #[tokio::test]
     async fn test_execute_operation_is_not_blocked() {
-        let log_dir = TempDir::new().unwrap();
+        let log_dir = TempTedgeDir::new();
         let operation_logs = OperationLogs::try_new(log_dir.path().to_path_buf()).unwrap();
 
         let now = std::time::Instant::now();
diff --git a/crates/core/tedge_mapper/src/c8y/dynamic_discovery.rs b/crates/core/tedge_mapper/src/c8y/dynamic_discovery.rs
index 535f396b..fca9057d 100644
--- a/crates/core/tedge_mapper/src/c8y/dynamic_discovery.rs
+++ b/crates/core/tedge_mapper/src/c8y/dynamic_discovery.rs
@@ -94,8 +94,8 @@ fn create_inotify_with_non_existing_dir() {
 
 #[test]
 fn create_inotify_with_right_directory() {
-    use tempfile::TempDir;
-    let dir = TempDir::new().unwrap().into_path();
-    let res = create_inotify_watch(dir);
+    use tedge_test_utils::fs::TempTedgeDir;
+    let dir = TempTedgeDir::new();
+    let res = create_inotify_watch(dir.path().to_path_buf());
     assert!(res.is_ok());
 }
diff --git a/crates/core/tedge_mapper/src/c8y/mapper.rs b/crates/core/tedge_mapper/src/c8y/mapper.rs
index 24dfde84..8ea3b4fc 100644
--- a/crates/core/tedge_mapper/src/c8y/mapper.rs
+++ b/crates/core/tedge_mapper/src/c8y/mapper.rs
@@ -130,7 +130,7 @@ mod tests {
     use mqtt_tests::{assert_received_all_expected, test_mqtt_broker};
     use serde_json::json;
     use std::time::Duration;
-    use tempfile::TempDir;
+    use tedge_test_utils::fs::TempTedgeDir;
     use test_case::test_case;
 
     const TEST_TIMEOUT_SECS: Duration = Duration::from_secs(5);
@@ -188,7 +188,7 @@ mod tests {
         let size_threshold = SizeThreshold(MQTT_MESSAGE_SIZE_THRESHOLD);
         let operations = Operations::default();
 
-        let tmp_dir = TempDir::new().unwrap();
+        let tmp_dir = TempTedgeDir::new();
         let converter = Box::new(
             CumulocityConverter::from_logs_path(
                 size_threshold,
@@ -196,7 +196,7 @@ mod tests {
                 DEVICE_TYPE.into(),
                 operations,
                 proxy,
-                tmp_dir.into_path(),
+                tmp_dir.path().to_path_buf(),
             )
             .unwrap(),
         );
diff --git a/crates/core/tedge_mapper/src/c8y/tests.rs b/crates/core/tedge_mapper/src/c8y/tests.rs
index 8596f594..78eee84c 100644
--- a/crates/core/tedge_mapper/src/c8y/tests.rs
+++ b/crates/core/tedge_mapper/src/c8y/tests.rs
@@ -19,7 +19,7 @@ use mqtt_tests::test_mqtt_server::MqttProcessHandler;
 use serde_json::json;
 use serial_test::serial;
 use std::{path::Path, time::Duration};
-use tempfile::TempDir;
+use tedge_test_utils::fs::TempTedgeDir;
 use test_case::test_case;
 use tokio::task::JoinHandle;
 
@@ -39,12 +39,12 @@ async fn mapper_publishes_a_software_list_request() {
         .await;
 
     // Start the SM Mapper
-    let sm_mapper = start_c8y_mapper(broker.port).await;
+    let (_tmp_dir, sm_mapper) = start_c8y_mapper(broker.port).await.unwrap();
 
     // Expect on `tedge/commands/req/software/list` a software list request.
     mqtt_tests::assert_received_all_expected(&mut messages, TEST_TIMEOUT_MS, &[r#"{"id":"#]).await;
 
-    sm_mapper.unwrap().abort();
+    sm_mapper.abort();
 }
 
 #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
@@ -55,12 +55,12 @@ async fn mapper_publishes_a_supported_operation_and_a_pending_operations_onto_c8
     let mut messages = broker.messages_published_on("c8y/s/us").await;
 
     // Start SM Mapper
-    let sm_mapper = start_c8y_mapper(broker.port).await;
+    let (_tmp_dir, sm_mapper) = start_c8y_mapper(broker.port).await.unwrap();
 
     // Expect 500 messages has been received on `c8y/s/us`, if no msg received for the timeout the test fails.
     mqtt_tests::assert_received_all_expected(&mut messages, TEST_TIMEOUT_MS, &["500\n"]).await;
 
-    sm_mapper.unwrap().abort();
+    sm_mapper.abort();
 }
 
 #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
@@ -73,8 +73,7 @@ async fn mapper_publishes_software_update_request() {
         .messages_published_on("tedge/commands/req/software/update")
         .await;
 
-    let sm_mapper = start_c8y_mapper(broker.port).await;
-
+    let (_tmp_dir, sm_mapper) = start_c8y_mapper(broker.port).await.unwrap();
     // Prepare and publish a software update smartrest request on `c8y/s/ds`.
     let smartrest = r#"528,external_id,nodered,1.0.0::debian,,install"#;
     let _ = broker.publish("c8y/s/ds", smartrest).await.unwrap();
@@ -101,7 +100,7 @@ async fn mapper_publishes_software_update_request() {
     )
     .await;
 
-    sm_mapper.unwrap().abort();
+    sm_mapper.abort();
 }
 
 #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
@@ -114,7 +113,7 @@ async fn mapper_publishes_software_update_status_onto_c8y_topic() {
     let mut messages = broker.messages_published_on("c8y/s/us").await;
 
     // Start SM Mapper
-    let sm_mapper = start_c8y_mapper(broker.port).await;
+    let (_tmp_dir, sm_mapper) = start_c8y_mapper(broker.port).await.unwrap();
     let _ = publish_a_fake_jwt_token(broker).await;
 
     // Prepare and publish a software update status response message `executing` on `tedge/commands/res/software/update`.
@@ -159,7 +158,7 @@ async fn mapper_publishes_software_update_status_onto_c8y_topic() {
     )
     .await;
 
-    sm_mapper.unwrap().abort();
+    sm_mapper.abort();
 }
 
 #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
@@ -169,7 +168,7 @@ async fn mapper_publishes_software_update_failed_status_onto_c8y_topic() {
     let mut messages = broker.messages_published_on("c8y/s/us").await;
 
     // Start SM Mapper
-    let sm_mapper = start_c8y_mapper(broker.port).await;
+    let (_tmp_dir, sm_mapper) = start_c8y_mapper(broker.port).await.unwrap();
     let _ = publish_a_fake_jwt_token(broker).await;
 
     // The agent publish an error
@@ -206,7 +205,7 @@ async fn mapper_publishes_software_update_failed_status_onto_c8y_topic() {
     )
     .await;
 
-    sm_mapper.unwrap().abort();
+    sm_mapper.abort();
 }
 
 #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
@@ -232,7 +231,7 @@ async fn mapper_fails_during_sw_update_recovers_and_process_response() -> Result
     let mut responses = broker.messages_published_on("c8y/s/us").await;