cmk-agent-ctl: Tests: Remove "controller_command"

CMK-19040 Change-Id: I0f6d2b26e25258cf1b71f4a7087c1fb1ba362f36
Checkmk · Feb 12, 2025 · 6b66359 · 6b66359
1 parent 8491d35
commit 6b66359
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 14 deletions.
diff --git a/packages/host/cmk-agent-ctl/tests/common/mod.rs b/packages/host/cmk-agent-ctl/tests/common/mod.rs
@@ -4,7 +4,6 @@
 
 pub mod agent;
 pub mod certs;
-use assert_cmd::Command;
 use std::path;
 
 #[cfg(not(feature = "build_system_bazel"))]
@@ -26,7 +25,3 @@ pub fn controller_command_path() -> path::PathBuf {
 pub fn setup_test_dir(prefix: &str) -> tempfile::TempDir {
     tempfile::Builder::new().prefix(prefix).tempdir().unwrap()
 }
-
-pub fn controller_command() -> Command {
-    Command::cargo_bin("cmk-agent-ctl").unwrap()
-}
diff --git a/packages/host/cmk-agent-ctl/tests/test_cli.rs b/packages/host/cmk-agent-ctl/tests/test_cli.rs
@@ -65,7 +65,9 @@ fn test_supported_modes(help_stdout: String) -> bool {
 
 #[test]
 fn test_help() {
-    let output = common::controller_command().arg("-h").unwrap();
+    let output = assert_cmd::Command::new(common::controller_command_path())
+        .arg("-h")
+        .unwrap();
     let stdout = std::str::from_utf8(&output.stdout).unwrap();
     assert!(stdout.contains("Checkmk agent controller"));
     assert!(test_supported_modes(String::from(stdout)));
@@ -87,7 +89,7 @@ async fn test_dump() -> AnyhowResult<()> {
         expected_remote_address,
     ));
 
-    let mut cmd = common::controller_command();
+    let mut cmd = assert_cmd::Command::new(common::controller_command_path());
 
     cmd.env("DEBUG_HOME_DIR", test_dir.path())
         .arg("-vv")
@@ -110,7 +112,7 @@ fn test_fail_become_user() {
         if mode == "help" {
             continue;
         }
-        let mut cmd = common::controller_command();
+        let mut cmd = assert_cmd::Command::new(common::controller_command_path());
         let err = cmd
             .arg(mode)
             .args(REQUIRED_ARGUMENTS.get(mode).unwrap_or(&vec![]))
@@ -130,7 +132,7 @@ fn test_fail_socket_missing() {
     let error_message_socket = "Something seems wrong with the agent socket";
 
     for mode in SUPPORTED_MODES {
-        let mut cmd = common::controller_command();
+        let mut cmd = assert_cmd::Command::new(common::controller_command_path());
         let output_res = cmd
             .timeout(std::time::Duration::from_secs(1))
             .env("DEBUG_HOME_DIR", "whatever")
@@ -187,7 +189,7 @@ fn test_migration_is_always_triggered() {
         }
         write_legacy_registry(&path_registry);
         assert!(config::Registry::from_file(&path_registry).is_err());
-        let mut cmd = common::controller_command();
+        let mut cmd = assert_cmd::Command::new(common::controller_command_path());
         cmd.timeout(std::time::Duration::from_secs(5))
             .env("DEBUG_HOME_DIR", test_dir.path())
             .arg(mode)
@@ -201,7 +203,7 @@ fn build_status_command_with_log(
     test_dir: &tempfile::TempDir,
     with_log_file: bool,
 ) -> assert_cmd::Command {
-    let mut cmd = common::controller_command();
+    let mut cmd = assert_cmd::Command::new(common::controller_command_path());
     cmd.timeout(std::time::Duration::from_secs(5))
         .env("DEBUG_HOME_DIR", test_dir.path())
         .env("MK_LOGDIR", test_dir.path())

diff --git a/packages/host/cmk-agent-ctl/tests/test_pull.rs b/packages/host/cmk-agent-ctl/tests/test_pull.rs
@@ -75,7 +75,7 @@ fn test_pull_inconsistent_cert() -> AnyhowResult<()> {
     );
     registry.save()?;
 
-    let output_err = common::controller_command()
+    let output_err = assert_cmd::Command::new(common::controller_command_path())
         .env("DEBUG_HOME_DIR", test_path)
         .arg("pull")
         .timeout(std::time::Duration::from_secs(5))

diff --git a/packages/host/cmk-agent-ctl/tests/test_status.rs b/packages/host/cmk-agent-ctl/tests/test_status.rs
@@ -36,7 +36,7 @@ async fn test_status_ok() {
         ));
     }
 
-    let mut cmd = common::controller_command();
+    let mut cmd = assert_cmd::Command::new(common::controller_command_path());
     cmd.env("DEBUG_HOME_DIR", test_dir.path())
         .arg("status")
         .unwrap()
@@ -53,7 +53,7 @@ async fn test_status_ok() {
 #[cfg(unix)]
 #[test]
 fn test_status_socket_down() {
-    let mut cmd = common::controller_command();
+    let mut cmd = assert_cmd::Command::new(common::controller_command_path());
     cmd.env("DEBUG_HOME_DIR", "/hurz/barz")
         .arg("status")
         .unwrap()