Merge test modules - cleanup.

src/daemon/http/server.rs

@@ -977,10 +977,12 @@ async fn refresh_all(req: Request) -> RoutingResult {
 #[cfg(test)]
 mod tests {
 
-    use super::*;
-    use crate::commons::util::test;
     use std::path::PathBuf;
 
+    use crate::test;
+
+    use super::*;
+
     #[tokio::test]
     async fn start_tls_server() {
         let dir = test::sub_dir(&PathBuf::from("work"));
@@ -993,6 +995,6 @@ mod tests {
 
         tokio::spawn(super::start(server_conf));
 
-        assert!(crate::daemon::test::primary_server_ready().await);
+        assert!(test::primary_server_ready().await);
     }
 }

src/daemon/http/tls_keys.rs

@@ -300,7 +300,7 @@ impl std::error::Error for Error {}
 #[cfg(test)]
 mod tests {
     // use actix_web::*;
-    use crate::commons::util::test;
+    use crate::test;
 
     use super::*;