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

Author: acogoluegnes

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

@@ -20,6 +20,7 @@
 import com.rabbitmq.client.impl.nio.NioParams;
 import com.rabbitmq.tools.Host;
 import org.junit.After;
+import org.junit.Assume;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.rules.TestRule;
@@ -37,6 +38,7 @@
 import java.util.concurrent.TimeoutException;
 
 import static org.junit.Assert.*;
+import static org.junit.Assume.*;
 
 public class BrokerTestCase {
 
@@ -81,6 +83,7 @@ protected boolean isAutomaticRecoveryEnabled() {
 
     @Before public void setUp()
             throws IOException, TimeoutException {
+        assumeTrue(shouldRun());
         openConnection();
         openChannel();
 
@@ -89,14 +92,26 @@ protected boolean isAutomaticRecoveryEnabled() {
 
     @After public void tearDown()
             throws IOException, TimeoutException {
-        closeChannel();
-        closeConnection();
+        if(shouldRun()) {
+            closeChannel();
+            closeConnection();
+
+            openConnection();
+            openChannel();
+            releaseResources();
+            closeChannel();
+            closeConnection();
+        }
+    }
 
-        openConnection();
-        openChannel();
-        releaseResources();
-        closeChannel();
-        closeConnection();
+    /**
+     * Whether to run the test or not.
+     * Subclasses can check whether some broker features
+     * are available or not, and choose not to run the test.
+     * @return
+     */
+    protected boolean shouldRun() throws IOException {
+        return true;
     }
 
     /**

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

@@ -34,6 +34,11 @@ public class TopicPermissions extends BrokerTestCase {
     String notProtectedTopic = "not.protected.topic";
     String noneTopicExchange = "not.a.topic";
 
+    @Override
+    protected boolean shouldRun() throws IOException {
+        return Host.isRabbitMqCtlCommandAvailable("set_topic_permissions");
+    }
+
     @Override
     protected void createResources() throws IOException, TimeoutException {
         channel.exchangeDeclare(protectedTopic, BuiltinExchangeType.TOPIC);

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

@@ -91,6 +91,12 @@ private static Process executeCommandProcess(String command) throws IOException
         return Runtime.getRuntime().exec(finalCommand);
     }
 
+    public static boolean isRabbitMqCtlCommandAvailable(String command) throws IOException {
+        Process process = rabbitmqctl("help");
+        String stdout = capture(process.getInputStream());
+        return stdout.contains(command);
+    }
+
     public static Process rabbitmqctl(String command) throws IOException {
         return executeCommand(rabbitmqctlCommand() +
                               " -n \'" + nodenameA() + "\'" +