From 30da293d8f24d744f1f672375745491316fb3b88 Mon Sep 17 00:00:00 2001
From: Rob Bradford <robert.bradford@intel.com>
Date: Fri, 1 Jul 2022 15:47:41 +0100
Subject: [PATCH] tests: Report stderr on ch-remote command failure

Signed-off-by: Rob Bradford <robert.bradford@intel.com>
---
 tests/integration.rs | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/tests/integration.rs b/tests/integration.rs
index 2e8a56887..5fdaafce1 100644
--- a/tests/integration.rs
+++ b/tests/integration.rs
@@ -253,8 +253,15 @@ fn remote_command(api_socket: &str, command: &str, arg: Option<&str>) -> bool {
     if let Some(arg) = arg {
         cmd.arg(arg);
     }
-
-    cmd.status().expect("Failed to launch ch-remote").success()
+    let output = cmd.output().unwrap();
+    if output.status.success() {
+        true
+    } else {
+        eprintln!("Error running ch-remote command: {:?}", &cmd);
+        let stderr = String::from_utf8_lossy(&output.stderr);
+        eprintln!("stderr: {}", stderr);
+        false
+    }
 }
 
 fn remote_command_w_output(api_socket: &str, command: &str, arg: Option<&str>) -> (bool, Vec<u8>) {