Merge branch '4.1.x-stable' into 4.2.x-stable

acogoluegnes · acogoluegnes · commit 55776e0b3ad3 · 2017-08-16T14:48:35.000+02:00
diff --git a/src/test/java/com/rabbitmq/tools/Host.java b/src/test/java/com/rabbitmq/tools/Host.java
@@ -92,9 +92,9 @@ private static Process executeCommandProcess(String command) throws IOException
     }
 
     public static boolean isRabbitMqCtlCommandAvailable(String command) throws IOException {
-        Process process = rabbitmqctl("help");
-        String stdout = capture(process.getInputStream());
-        return stdout.contains(command);
+        Process process = rabbitmqctlIgnoreErrors("");
+        String stderr = capture(process.getErrorStream());
+        return stderr.contains(command);
     }
 
     public static Process rabbitmqctl(String command) throws IOException {

Original file line number	Diff line number	Diff line change
`@@ -92,9 +92,9 @@ private static Process executeCommandProcess(String command) throws IOException`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`public static boolean isRabbitMqCtlCommandAvailable(String command) throws IOException {`
`95`		`- Process process = rabbitmqctl("help");`
`96`		`- String stdout = capture(process.getInputStream());`
`97`		`- return stdout.contains(command);`
	`95`	`+ Process process = rabbitmqctlIgnoreErrors("");`
	`96`	`+ String stderr = capture(process.getErrorStream());`
	`97`	`+ return stderr.contains(command);`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`public static Process rabbitmqctl(String command) throws IOException {`