Use rabbitmqctl to restart broker in tests

Instead of make. This makes the build less dependant on the umbrella.

[#156274540]

Author: acogoluegnes

.travis.yml

@@ -31,7 +31,7 @@ branches:
 before_script:
   - ./bin/before_build.sh
 
-script: ./mvnw clean verify -P '!setup-test-node' -Dtravis-ci=true -Drabbitmqctl.bin='rabbitmq/sbin/rabbitmqctl' -Dtest-broker.A.nodename=rabbit@$(hostname) -Dtest-client-cert.password= -Dtest-tls-certs.dir=/tmp/tls-gen/basic
+script: ./mvnw clean verify -P '!setup-test-node' -Drabbitmqctl.bin='rabbitmq/sbin/rabbitmqctl' -Dtest-broker.A.nodename=rabbit@$(hostname) -Dtest-client-cert.password= -Dtest-tls-certs.dir=/tmp/tls-gen/basic
 cache:
   directories:
     - $HOME/.m2

src/test/java/com/rabbitmq/integration/tests/ConnectionForceCloseOnReceiveIT.java

@@ -57,7 +57,7 @@ public void onException(JMSException exception) {
 
         Thread.sleep(ONE_SECOND);
 
-        Shell.invokeMakeTarget("stop-rabbit-on-node start-rabbit-on-node");
+        Shell.restartNode();
 
 
         try {

src/test/java/com/rabbitmq/jms/util/Shell.java

@@ -1,7 +1,10 @@
 /* Copyright (c) 2014 Pivotal Software, Inc. All rights reserved. */
 package com.rabbitmq.jms.util;
 
-import java.io.*;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
 
 /**
  * Shell is a test utility class for issuing shell commands from integration tests.
@@ -19,7 +22,7 @@ public static String executeSimpleCommand(String command) {
             process.waitFor();
             BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream()));
             String line = "";
-            while ((line = reader.readLine())!= null) {
+            while ((line = reader.readLine()) != null) {
                 outputSb.append(line + "\n");
             }
             reader.close();
@@ -35,10 +38,8 @@ public static String executeControl(String cmd) {
     }
     */
 
-
     public static String capture(InputStream is)
-        throws IOException
-    {
+        throws IOException {
         BufferedReader br = new BufferedReader(new InputStreamReader(is));
         String line;
         StringBuilder buff = new StringBuilder();
@@ -48,19 +49,12 @@ public static String capture(InputStream is)
         return buff.toString();
     }
 
-    public static Process invokeMakeTarget(String command) throws IOException {
-        File rabbitmqctl = new File(rabbitmqctlCommand());
-        return executeCommand(makeCommand() +
-            " -C \'" + rabbitmqDir() + "\'" +
-            " RABBITMQCTL=\'" + rabbitmqctl.getAbsolutePath() + "\'" +
-            " RABBITMQ_NODENAME=\'" + nodenameA() + "\'" +
-            " RABBITMQ_NODE_PORT=" + node_portA() +
-            " RABBITMQ_CONFIG_FILE=\'" + config_fileA() + "\'" +
-            " " + command);
+    public static void restartNode() throws IOException {
+        executeCommand(rabbitmqctlCommand() + " -n " + nodenameA() + " stop_app");
+        executeCommand(rabbitmqctlCommand() + " -n " + nodenameA() + " start_app");
     }
 
-    public static Process executeCommand(String command) throws IOException
-    {
+    public static Process executeCommand(String command) throws IOException {
         Process pr = executeCommandProcess(command);
 
         int ev = waitForExitValue(pr);
@@ -76,17 +70,17 @@ public static Process executeCommand(String command) throws IOException
     }
 
     private static int waitForExitValue(Process pr) {
-        while(true) {
+        while (true) {
             try {
                 pr.waitFor();
                 break;
-            } catch (InterruptedException ignored) {}
+            } catch (InterruptedException ignored) {
+            }
         }
         return pr.exitValue();
     }
 
-    private static Process executeCommandProcess(String command) throws IOException
-    {
+    private static Process executeCommandProcess(String command) throws IOException {
         String[] finalCommand;
         if (System.getProperty("os.name").toLowerCase().contains("windows")) {
             finalCommand = new String[4];
@@ -103,33 +97,27 @@ private static Process executeCommandProcess(String command) throws IOException
         return Runtime.getRuntime().exec(finalCommand);
     }
 
-    public static String makeCommand()
-    {
+    public static String makeCommand() {
         return System.getProperty("make.bin", "make");
     }
 
-    public static String nodenameA()
-    {
+    public static String nodenameA() {
         return System.getProperty("test-broker.A.nodename");
     }
 
-    public static String node_portA()
-    {
+    public static String node_portA() {
         return System.getProperty("test-broker.A.node_port");
     }
 
-    public static String config_fileA()
-    {
+    public static String config_fileA() {
         return System.getProperty("test-broker.A.config_file");
     }
 
-    public static String rabbitmqctlCommand()
-    {
+    public static String rabbitmqctlCommand() {
         return System.getProperty("rabbitmqctl.bin");
     }
 
-    public static String rabbitmqDir()
-    {
+    public static String rabbitmqDir() {
         return System.getProperty("rabbitmq.dir");
     }
 }