experiment explicitly attempt to retain the logs

Author: adamspofford-dfinity

.github/workflows/test.yml

@@ -171,7 +171,7 @@ jobs:
           echo "ICP_CLI_NETWORK_LAUNCHER_PATH=$DEST/icp-cli-network-launcher" >> "$GITHUB_ENV"
 
       - name: Run ${{ matrix.test }}
-        run: cargo test --test ${{ matrix.test }} -- ${{ contains(matrix.os, 'macos') && '--skip :docker:' || '' }} --test-threads=4
+        run: cargo test --test ${{ matrix.test }} -- ${{ contains(matrix.os, 'macos') && '--skip :docker:' || '' }}
 
   aggregate:
     name: test:required

crates/icp-cli/tests/common/context.rs

@@ -198,7 +198,7 @@ impl TestContext {
         cmd.env("HOME", self.home_path()).env_remove("ICP_HOME");
         #[cfg(windows)]
         cmd.env("ICP_HOME", self.home_path().join("icp"));
-        cmd.arg("network").arg("start").arg(name).arg("--debug");
+        cmd.arg("network").arg("start").arg(name);
         #[cfg(unix)]
         {
             let launcher_path = self.launcher_path().await;
@@ -448,9 +448,20 @@ impl TestContext {
                 }
             }
             if elapsed > timeout {
-                panic!(
+                eprintln!(
                     "Timed out waiting for network descriptor at {descriptor_path} after {elapsed}s"
                 );
+                let cid = std::fs::read_to_string(project_dir.join("container_id.txt")).unwrap();
+                let logs = std::process::Command::new("docker")
+                    .args(["logs", cid.trim()])
+                    .output()
+                    .unwrap();
+                let logs = format!(
+                    "{}\n{}",
+                    String::from_utf8_lossy(&logs.stdout),
+                    String::from_utf8_lossy(&logs.stderr)
+                );
+                eprintln!("Container logs:\n{logs}");
             }
             std::thread::sleep(std::time::Duration::from_millis(100));
         };

crates/icp/src/network/managed/docker.rs

@@ -6,8 +6,13 @@ use bollard::{
     Docker,
     errors::Error as BollardError,
     query_parameters::{
-        CreateContainerOptions, CreateImageOptions, InspectContainerOptions,
-        RemoveContainerOptions, StartContainerOptions, StopContainerOptions, WaitContainerOptions,
+        CreateContainerOptions,
+        CreateImageOptions,
+        InspectContainerOptions,
+        // RemoveContainerOptions,
+        StartContainerOptions,
+        StopContainerOptions,
+        WaitContainerOptions,
     },
     secret::{ContainerCreateBody, HostConfig, Mount, MountTypeEnum, PortBinding},
 };
@@ -200,6 +205,7 @@ pub async fn spawn_docker_launcher(
                             .try_collect()?,
                     ),
                     shm_size: *shm_size,
+
                     ..<_>::default()
                 }),
                 ..<_>::default()
@@ -209,6 +215,7 @@ pub async fn spawn_docker_launcher(
         .context(CreateContainerSnafu { image_name: image })?;
     let container_id = container_resp.id;
     eprintln!("Created container {}", &container_id[..12]);
+    std::fs::write("container_id.txt", &container_id).unwrap();
     let guard = AsyncDropper::new(DockerDropGuard {
         container_id: Some(container_id),
         docker: Some(docker),
@@ -341,18 +348,18 @@ pub async fn stop_docker_launcher(
 async fn stop(
     docker: &Docker,
     container_id: &str,
-    rm_on_exit: bool,
+    _rm_on_exit: bool,
 ) -> Result<(), StopContainerError> {
     docker
         .stop_container(container_id, None::<StopContainerOptions>)
         .await
         .context(StopSnafu { container_id })?;
-    if rm_on_exit {
-        docker
-            .remove_container(container_id, None::<RemoveContainerOptions>)
-            .await
-            .context(RemoveSnafu { container_id })?;
-    }
+    // if rm_on_exit {
+    //     docker
+    //         .remove_container(container_id, None::<RemoveContainerOptions>)
+    //         .await
+    //         .context(RemoveSnafu { container_id })?;
+    // }
     Ok(())
 }