Make this test aware that HA tests are running, it needs to assert a different value for the redelivered flag.

Author: Simon MacMullen

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

@@ -22,6 +22,8 @@
 import junit.framework.TestSuite;
 
 public class HATests extends TestSuite {
+    public static boolean HA_TESTS_RUNNING = false;
+
     public static TestSuite suite() {
         TestSuite suite = new TestSuite("server-tests");
         suite.addTestSuite(SetUp.class);
@@ -38,6 +40,7 @@ public static class SetUp extends TestCase {
         @Override
         protected void setUp() throws Exception {
             Host.executeCommand("cd ../rabbitmq-test; make enable-ha");
+            HA_TESTS_RUNNING = true;
         }
 
         public void testNothing() {}
@@ -47,6 +50,7 @@ public static class TearDown extends TestCase {
         @Override
         protected void tearDown() throws Exception {
             Host.executeCommand("cd ../rabbitmq-test; make disable-ha");
+            HA_TESTS_RUNNING = false;
         }
 
         public void testNothing() {}

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

@@ -34,7 +34,10 @@ public void testMessageRecovery()
         waitForConfirms();
 
         restart();
-        assertDelivered(Q, 1);
+
+        // 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);
         channel.queueDelete(Q);
     }