Make tests more portable to allow them to run under cargo stress

Author: jarhodes314

crates/common/axum_tls/src/files.rs

@@ -114,6 +114,7 @@ mod tests {
     use assert_matches::assert_matches;
     use axum::routing::get;
     use axum::Router;
+    use camino::Utf8PathBuf;
     use std::io::Cursor;
 
     mod read_trust_store {
@@ -199,27 +200,28 @@ mod tests {
         }
 
         fn copy_test_file_to(test_file: &str, path: impl AsRef<Path>) -> io::Result<u64> {
-            std::fs::copy(format!("./test_data/{test_file}"), path)
+            let dir = env!("CARGO_MANIFEST_DIR");
+            std::fs::copy(format!("{dir}/test_data/{test_file}"), path)
         }
     }
 
     #[test]
     fn load_pkey_fails_when_given_x509_certificate() {
+        let dir = env!("CARGO_MANIFEST_DIR");
+        let path = Utf8PathBuf::from(format!("{dir}/test_data/ec.crt"));
         assert_eq!(
-            load_pkey(Utf8Path::new("./test_data/ec.crt"))
-                .unwrap_err()
-                .to_string(),
-            "expected private key in \"./test_data/ec.crt\", found an X509 certificate"
+            load_pkey(&path).unwrap_err().to_string(),
+            format!("expected private key in {path:?}, found an X509 certificate")
         );
     }
 
     #[test]
     fn load_pkey_fails_when_given_certificate_revocation_list() {
+        let dir = env!("CARGO_MANIFEST_DIR");
+        let path = Utf8PathBuf::from(format!("{dir}/test_data/demo.crl"));
         assert_eq!(
-            load_pkey(Utf8Path::new("./test_data/demo.crl"))
-                .unwrap_err()
-                .to_string(),
-            "expected private key in \"./test_data/demo.crl\", found a CRL"
+            load_pkey(&path).unwrap_err().to_string(),
+            format!("expected private key in {path:?}, found a CRL")
         );
     }
 
@@ -288,7 +290,8 @@ mod tests {
         }
 
         fn test_data(file_name: &str) -> String {
-            std::fs::read_to_string(format!("./test_data/{file_name}"))
+            let dir = env!("CARGO_MANIFEST_DIR");
+            std::fs::read_to_string(format!("{dir}/test_data/{file_name}"))
                 .with_context(|| format!("opening file {file_name} from test_data"))
                 .unwrap()
         }

crates/core/plugin_sm/tests/plugin.rs

@@ -1,6 +1,5 @@
 #[cfg(test)]
 mod tests {
-
     use certificate::CloudRootCerts;
     use plugin_sm::plugin::deserialize_module_info;
     use plugin_sm::plugin::sm_path;
@@ -9,7 +8,6 @@ mod tests {
     use std::io::Write;
     use std::path::Path;
     use std::path::PathBuf;
-    use std::str::FromStr;
     use tedge_api::SoftwareError;
     use tedge_api::SoftwareModule;
     use tedge_config::SudoCommandBuilder;
@@ -194,13 +192,9 @@ mod tests {
     }
 
     fn get_dummy_plugin_path() -> PathBuf {
-        // Return a path to a dummy plugin in target directory.
-        let package_dir = std::env::var("CARGO_MANIFEST_DIR").unwrap();
-
         // To get the plugin binary path we need to find the `target` directory which is 3 levels above the `Cargo.toml` file of the package
         // CARGO_MANIFEST_DIR == ./thin-edge.io/crates/core/plugin_sm
-        let dummy_plugin_path = PathBuf::from_str(package_dir.as_str())
-            .unwrap()
+        let dummy_plugin_path = Path::new(env!("CARGO_MANIFEST_DIR"))
             .parent() //./thin-edge.io/crates/core/
             .unwrap()
             .parent() // ./thin-edge.io/crates/