tests: fix tests failing in CI cause of interactive image pulling

Also fixed applied clippy suggestions and removed serial_test crate

Author: sandorex

.github/workflows/test.yml

@@ -10,16 +10,23 @@ on:
 
 env:
   CARGO_TERM_COLOR: always
+  CARGO_BUILD_TARGET: x86_64-unknown-linux-musl
 
 jobs:
   build:
     runs-on: ubuntu-latest
 
     steps:
     - uses: actions/checkout@v4
+
+    - name: Fetch Toolchain
+      run: rustup target add x86_64-unknown-linux-musl
+
     - name: Build
       run: cargo build --verbose
-    - name: Run tests
-      run: cargo test --verbose -- --include-ignored
+
+    - name: Run Tests
+      run: cargo test --verbose -- --include-ignored --show-output
+
     - name: Run clippy
       run: cargo clippy --verbose

Cargo.toml

@@ -31,4 +31,3 @@ vergen-git2 = { version = "1.0.0", features = ["build", "cargo", "rustc"] }
 assert_cmd = "2.0.16"
 rexpect = "0.6.0"
 tempfile = "3.16.0"
-serial_test = "*"

src/commands/cmd_exec.rs

@@ -81,13 +81,12 @@ mod tests {
 
     #[test]
     #[ignore]
-    #[serial]
     fn cmd_exec_podman() -> Result<()> {
         let tempdir = tempfile::tempdir()?;
 
         // create the container
         let cmd = Command::cargo_bin(env!("CARGO_BIN_NAME"))?
-            .args(["start", "debian:trixie"])
+            .args(["start", DEBIAN_IMAGE])
             .current_dir(tempdir.path())
             .assert()
             .success();

src/commands/cmd_exists.rs

@@ -24,7 +24,6 @@ mod tests {
 
     #[test]
     #[ignore]
-    #[serial]
     fn cmd_exists_podman() -> Result<()> {
         let tempdir = tempfile::tempdir()?;
 
@@ -38,7 +37,7 @@ mod tests {
 
         // create the container
         let cmd = Command::cargo_bin(env!("CARGO_BIN_NAME"))?
-            .args(["start", "debian:trixie"])
+            .args(["start", DEBIAN_IMAGE])
             .current_dir(tempdir.path())
             .assert()
             .success();

src/commands/cmd_kill.rs

@@ -70,13 +70,12 @@ mod tests {
 
     #[test]
     #[ignore]
-    #[serial]
     fn cmd_kill_podman() -> Result<()> {
         let tempdir = tempfile::tempdir()?;
 
         // create the container
         let cmd = Command::cargo_bin(env!("CARGO_BIN_NAME"))?
-            .args(["start", "debian:trixie"])
+            .args(["start", DEBIAN_IMAGE])
             .current_dir(tempdir.path())
             .assert()
             .success();
@@ -107,12 +106,11 @@ mod tests {
 
     #[test]
     #[ignore]
-    #[serial]
     fn cmd_kill_interactive_podman() -> Result<()> {
         let tempdir = tempfile::tempdir()?;
 
         let cmd = Command::cargo_bin(env!("CARGO_BIN_NAME"))?
-            .args(["start", "debian:trixie"])
+            .args(["start", DEBIAN_IMAGE])
             .current_dir(tempdir.path())
             .assert()
             .success();

src/commands/cmd_shell.rs

@@ -82,12 +82,11 @@ mod tests {
 
     #[test]
     #[ignore]
-    #[serial]
     fn cmd_shell_podman() -> Result<()> {
         let tempdir = tempfile::tempdir()?;
 
         let cmd = Command::cargo_bin(env!("CARGO_BIN_NAME"))?
-            .args(["start", "debian:trixie"])
+            .args(["start", DEBIAN_IMAGE])
             .current_dir(tempdir.path())
             .assert()
             .success();

src/commands/cmd_start.rs

@@ -403,8 +403,7 @@ asroot chown "$USER:$USER" {0}
         }
 
         // remove pre-init flag to start initalization
-        ctx.engine
-            .exec(id, &vec!["rm", crate::FLAG_FILE_PRE_INIT])?;
+        ctx.engine.exec(id, &["rm", crate::FLAG_FILE_PRE_INIT])?;
 
         log::trace!("Waiting for container initialization");
 
@@ -441,12 +440,11 @@ mod tests {
 
     #[test]
     #[ignore]
-    #[serial]
     fn cmd_start_podman() -> Result<()> {
         let tempdir = tempfile::tempdir()?;
 
         let cmd = Command::cargo_bin(env!("CARGO_BIN_NAME"))?
-            .args(["start", "debian:trixie"])
+            .args(["start", DEBIAN_IMAGE])
             .current_dir(tempdir.path())
             .assert()
             .success();
@@ -460,7 +458,7 @@ mod tests {
 
         // try to start another container in same directory
         Command::cargo_bin(env!("CARGO_BIN_NAME"))?
-            .args(["start", "--name", &container, "debian:trixie"])
+            .args(["start", "--name", &container, DEBIAN_IMAGE])
             .current_dir(tempdir.path())
             .assert()
             .failure()

src/commands/cmd_start/util.rs

@@ -80,7 +80,7 @@ pub fn find_terminfo() -> Vec<String> {
     }
 
     // use TERMINFO_DIRS if defined
-    if let Some(env_dirs) = std::env::var("TERMINFO_DIRS").ok() {
+    if let Ok(env_dirs) = std::env::var("TERMINFO_DIRS") {
         log::debug!("Looking for terminfo directories from environment variable");
 
         // filter existing directories

src/config.rs

@@ -30,14 +30,14 @@ impl TryInto<Config> for ConfigFile {
 
     fn try_into(self) -> std::result::Result<Config, Self::Error> {
         match self {
-            Self::V01(x) => Ok(x.try_into()?),
+            Self::V01(x) => Ok(x),
         }
     }
 }
 
 impl ConfigFile {
     pub fn config_from_str(input: &str) -> Result<Config> {
-        Ok(toml::from_str::<ConfigFile>(input)?.try_into()?)
+        toml::from_str::<ConfigFile>(input)?.try_into()
     }
 
     pub fn config_from_file(file: &Path) -> Result<Config> {

src/engine/podman.rs

@@ -134,6 +134,8 @@ impl Engine for Podman {
         cmd.args(["image", "pull", image]);
 
         if interactive {
+            // print to stderr to prevent issues with reading container name
+            cmd.stdout(std::io::stderr());
             cmd.log_status_anyhow()?;
         } else {
             cmd.log_output_anyhow()?;
@@ -197,7 +199,6 @@ mod tests {
 
     #[test]
     #[ignore]
-    #[serial]
     fn engine_inspect_podman() -> Result<()> {
         let obj = serde_json::from_str::<Vec<PodmanContainerInfo>>(INSPECT_OUTPUT)?;
         assert_eq!(
@@ -225,7 +226,7 @@ mod tests {
             }
         );
 
-        let container = Podman.start_dummy_container("debian:trixie", None)?;
+        let container = Podman.start_dummy_container(DEBIAN_IMAGE, None)?;
 
         // ensure some data is extracted
         assert!(!Podman.inspect_containers(vec![&container])?.is_empty());
@@ -235,9 +236,8 @@ mod tests {
 
     #[test]
     #[ignore]
-    #[serial]
     fn engine_exists_podman() -> Result<()> {
-        let container = Podman.start_dummy_container("debian:trixie", None)?;
+        let container = Podman.start_dummy_container(DEBIAN_IMAGE, None)?;
 
         assert!(Podman.container_exists(&container)?);