Address code review.

Author: Alexhuszagh

src/docker/shared.rs

@@ -791,15 +791,6 @@ mod tests {
             Engine::from_path(get_container_engine()?, Some(false), msg_info)
         }
 
-        fn get_workspace_root(subdir: bool) -> Result<PathBuf> {
-            let path = match subdir {
-                true => get_cwd()?.join("member"),
-                false => get_cwd()?.parent().unwrap().to_path_buf(),
-            };
-            fs::create_dir_all(&path)?;
-            Ok(path)
-        }
-
         fn cargo_metadata(subdir: bool, msg_info: MessageInfo) -> Result<CargoMetadata> {
             let mut metadata = cargo_metadata_with_args(
                 Some(Path::new(env!("CARGO_MANIFEST_DIR"))),
@@ -808,7 +799,12 @@ mod tests {
             )?
             .ok_or_else(|| eyre::eyre!("could not find cross workspace"))?;
 
-            metadata.workspace_root = get_workspace_root(subdir)?;
+            let root = match subdir {
+                true => get_cwd()?.join("member"),
+                false => get_cwd()?.parent().unwrap().to_path_buf(),
+            };
+            fs::create_dir_all(&root)?;
+            metadata.workspace_root = root;
             metadata.target_directory = metadata.workspace_root.join("target");
 
             Ok(metadata)
@@ -832,12 +828,13 @@ mod tests {
                 .join("stable-x86_64-unknown-linux-gnu"))
         }
 
-        fn get_directories(subdir: bool, mount_finder: &MountFinder) -> Result<Directories> {
-            let msg_info = MessageInfo::default();
-            let metadata = cargo_metadata(subdir, msg_info)?;
+        fn get_directories(
+            metadata: &CargoMetadata,
+            mount_finder: &MountFinder,
+        ) -> Result<Directories> {
             let cwd = get_cwd()?;
             let sysroot = get_sysroot()?;
-            Directories::create(mount_finder, &metadata, &cwd, &sysroot)
+            Directories::create(mount_finder, metadata, &cwd, &sysroot)
         }
 
         fn path_to_posix(path: &Path) -> Result<String> {
@@ -861,13 +858,14 @@ mod tests {
         fn test_host() -> Result<()> {
             let vars = unset_env();
             let mount_finder = MountFinder::new(vec![]);
-            let directories = get_directories(false, &mount_finder)?;
+            let metadata = cargo_metadata(false, MessageInfo::default())?;
+            let directories = get_directories(&metadata, &mount_finder)?;
             paths_equal(&directories.cargo, &home()?.join(".cargo"))?;
             paths_equal(&directories.xargo, &home()?.join(".xargo"))?;
-            paths_equal(&directories.host_root, &get_workspace_root(false)?)?;
+            paths_equal(&directories.host_root, &metadata.workspace_root)?;
             assert_eq!(
                 &directories.mount_root,
-                &path_to_posix(&get_workspace_root(false)?)?
+                &path_to_posix(&metadata.workspace_root)?
             );
             assert_eq!(&directories.mount_cwd, &path_to_posix(&get_cwd()?)?);
 
@@ -876,16 +874,14 @@ mod tests {
         }
 
         #[test]
+        #[cfg_attr(not(target_os = "linux"), ignore)]
         fn test_docker_in_docker() -> Result<()> {
-            if !cfg!(target_os = "linux") {
-                return Ok(());
-            }
-
             let vars = unset_env();
 
             let engine = create_engine(MessageInfo::default());
             let hostname = env::var("HOSTNAME");
             if engine.is_err() || hostname.is_err() {
+                eprintln!("could not get container engine or no hostname found");
                 reset_env(vars);
                 return Ok(());
             }
@@ -895,12 +891,14 @@ mod tests {
                 .arg(hostname)
                 .run_and_get_output(MessageInfo::default())?;
             if !output.status.success() {
+                eprintln!("inspect failed");
                 reset_env(vars);
                 return Ok(());
             }
 
             let mount_finder = MountFinder::create(&engine, true)?;
-            let directories = get_directories(true, &mount_finder)?;
+            let metadata = cargo_metadata(true, MessageInfo::default())?;
+            let directories = get_directories(&metadata, &mount_finder)?;
             let mount_finder = MountFinder::new(docker_read_mount_paths(&engine)?);
             let mount_path = |p| mount_finder.find_mount_path(p);