Merge default into bug23451

Author: Rob Harrop

nexus-upload.sh

@@ -19,10 +19,10 @@ for artifact in $@; do
   rm -f $artifact.asc
   gpg --homedir $GNUPG_PATH/.gnupg --local-user $SIGNING_KEY --no-tty --armor --detach-sign --output $artifact.asc $artifact
   for ext in '' .asc ; do
-    curl -XPUT --data-binary @$artifact$ext $NEXUS_ROOT/$artifact$ext
+    curl --upload-file $artifact$ext $NEXUS_ROOT/$artifact$ext
     for sum in md5 sha1 ; do
       ${sum}sum $artifact$ext | (read a rest ; echo -n "$a") >$artifact$ext.$sum
-      curl -XPUT --data-binary @$artifact$ext.$sum $NEXUS_ROOT/$artifact$ext.$sum
+      curl --upload-file $artifact$ext.$sum $NEXUS_ROOT/$artifact$ext.$sum
     done
   done
 done

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

@@ -226,5 +226,4 @@ protected void deleteExchange(String x) throws IOException {
   protected void deleteQueue(String q) throws IOException {
     channel.queueDelete(q);
   }
-
 }

test/src/com/rabbitmq/client/test/functional/QosTests.java

@@ -17,6 +17,7 @@
 
 package com.rabbitmq.client.test.functional;
 
+import com.rabbitmq.client.test.BrokerTestCase;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -33,7 +34,8 @@
 import com.rabbitmq.client.GetResponse;
 import com.rabbitmq.client.QueueingConsumer;
 import com.rabbitmq.client.QueueingConsumer.Delivery;
-import com.rabbitmq.client.test.BrokerTestCase;
+
+import com.rabbitmq.client.Envelope;
 
 public class QosTests extends BrokerTestCase
 {

test/src/com/rabbitmq/client/test/functional/TransactionsBase.java

@@ -17,12 +17,12 @@
 
 package com.rabbitmq.client.test.functional;
 
+import com.rabbitmq.client.AMQP;
+import com.rabbitmq.client.test.BrokerTestCase;
 import java.io.IOException;
 
-import com.rabbitmq.client.AMQP;
-import com.rabbitmq.client.AMQP.BasicProperties;
 import com.rabbitmq.client.GetResponse;
-import com.rabbitmq.client.test.BrokerTestCase;
+import com.rabbitmq.client.AMQP.BasicProperties;
 
 public abstract class TransactionsBase
     extends BrokerTestCase

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

@@ -30,10 +30,6 @@ protected void restart()
     {
         tearDown();
         Host.executeCommand("cd ../rabbitmq-test; make restart-app");
-        try {
-            Thread.sleep(3000);
-        } catch (InterruptedException e) {
-        }
         setUp();
     }
 

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

@@ -26,10 +26,10 @@ public static TestSuite suite() {
         suite.addTestSuite(Permissions.class);
         suite.addTestSuite(DurableBindingLifecycle.class);
         suite.addTestSuite(EffectVisibilityCrossNodeTest.class);
-        suite.addTest(PersisterRestartTests.suite());
         suite.addTestSuite(ExclusiveQueueDurability.class);
         suite.addTestSuite(AlternateExchangeEquivalence.class);
         suite.addTestSuite(MemoryAlarms.class);
+        suite.addTest(PersisterRestartTests.suite());
         return suite;
     }
 }