make HATests pass when there is just a single node

Author: rade

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

@@ -15,13 +15,18 @@
 
 package com.rabbitmq.client.test.server;
 
+import com.rabbitmq.client.AMQP;
+import com.rabbitmq.client.Channel;
 import com.rabbitmq.client.MessageProperties;
 import com.rabbitmq.client.test.ConfirmBase;
 
+import java.io.IOException;
+
 public class MessageRecovery extends ConfirmBase
 {
 
     private final static String Q = "recovery-test";
+    private final static String Q2 = "recovery-test-ha-check";
 
     public void testMessageRecovery()
         throws Exception
@@ -33,11 +38,28 @@ public void testMessageRecovery()
                              "nop".getBytes());
         waitForConfirms();
 
+        channel.queueDeclare(Q2, false, false, false, null);
+
         restart();
 
-        // When testing in HA mode the message will be collected from a promoted
-        // slave and wil have its redelivered flag set.
-        assertDelivered(Q, 1, HATests.HA_TESTS_RUNNING);
+        // When testing in HA mode the message will be collected from
+        // a promoted slave and will have its redelivered flag
+        // set. But that only happens if there actually *is* a
+        // slave. We test that by passively declaring, and
+        // subsequently deletign, the secondary, non-durable queue,
+        // which only succeeds if the queue survived the restart,
+        // which in turn implies that it must have been a HA queue
+        // with slave(s).
+        boolean expectDelivered = false;
+        try {
+            channel.queueDeclarePassive(Q2);
+            channel.queueDelete(Q2);
+            expectDelivered = true;
+        } catch (IOException e) {
+            checkShutdownSignal(AMQP.NOT_FOUND, e);
+            openChannel();
+        }
+        assertDelivered(Q, 1, expectDelivered);
         channel.queueDelete(Q);
     }