Use rabbitmqctl to manipulate alarms in tests

Avoid using make and depending on the umbrella.

(cherry picked from commit 9dc2a6a)

Author: acogoluegnes

src/test/java/com/rabbitmq/client/test/BrokerTestCase.java

@@ -320,17 +320,17 @@ protected void deleteQueues(String [] queues) throws IOException {
         }
     }
 
-    protected void clearAllResourceAlarms() throws IOException, InterruptedException {
+    protected void clearAllResourceAlarms() throws IOException {
         clearResourceAlarm("memory");
         clearResourceAlarm("disk");
     }
 
-    protected void setResourceAlarm(String source) throws IOException, InterruptedException {
-        Host.invokeMakeTarget("set-resource-alarm SOURCE=" + source);
+    protected void setResourceAlarm(String source) throws IOException {
+        Host.setResourceAlarm(source);
     }
 
-    protected void clearResourceAlarm(String source) throws IOException, InterruptedException {
-        Host.invokeMakeTarget("clear-resource-alarm SOURCE=" + source);
+    protected void clearResourceAlarm(String source) throws IOException {
+        Host.clearResourceAlarm(source);
     }
 
     protected void block() throws IOException, InterruptedException {

src/test/java/com/rabbitmq/client/test/server/MemoryAlarms.java

@@ -47,6 +47,7 @@ public void setUp() throws IOException, TimeoutException {
 
     @Override
     public void tearDown() throws IOException, TimeoutException {
+        clearAllResourceAlarms();
         if (channel2 != null) {
             channel2.abort();
             channel2 = null;
@@ -66,13 +67,7 @@ protected void createResources() throws IOException {
 
     @Override
     protected void releaseResources() throws IOException {
-        try {
-            clearAllResourceAlarms();
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        } finally {
-            channel.queueDelete(Q);
-        }
+        channel.queueDelete(Q);
     }
 
     @Test public void flowControl() throws IOException, InterruptedException {

src/test/java/com/rabbitmq/tools/Host.java

@@ -109,6 +109,14 @@ public static Process rabbitmqctlIgnoreErrors(String command) throws IOException
                                             " " + command);
     }
 
+    public static void setResourceAlarm(String source) throws IOException {
+        rabbitmqctl("eval 'rabbit_alarm:set_alarm({{resource_limit, " + source +  ", node()}, []}).'");
+    }
+
+    public static void clearResourceAlarm(String source) throws IOException {
+        rabbitmqctl("eval 'rabbit_alarm:clear_alarm({resource_limit, " + source + ", node()}).'");
+    }
+
     public static Process invokeMakeTarget(String command) throws IOException {
         File rabbitmqctl = new File(rabbitmqctlCommand());
         return executeCommand(makeCommand() +