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

acogoluegnes · acogoluegnes · commit 5c3b0f254c44 · 2017-09-21T11:18:55.000+02:00
diff --git a/src/test/java/com/rabbitmq/client/test/server/PersistenceGuarantees.java b/src/test/java/com/rabbitmq/client/test/server/PersistenceGuarantees.java
@@ -34,7 +34,8 @@ protected NioParams nioParams() {
         NioParams nioParams = super.nioParams();
         // may need a higher enqueuing timeout on slow environments
         return nioParams
-            .setWriteEnqueuingTimeoutInMs(nioParams.getWriteEnqueuingTimeoutInMs() * 2);
+            .setWriteEnqueuingTimeoutInMs(nioParams.getWriteEnqueuingTimeoutInMs() * 3)
+            .setWriteQueueCapacity(nioParams.getWriteQueueCapacity() * 2);
     }
 
     protected void declareQueue() throws IOException {

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,8 @@ protected NioParams nioParams() {`
`34`	`34`	`NioParams nioParams = super.nioParams();`
`35`	`35`	`// may need a higher enqueuing timeout on slow environments`
`36`	`36`	`return nioParams`
`37`		`- .setWriteEnqueuingTimeoutInMs(nioParams.getWriteEnqueuingTimeoutInMs() * 2);`
	`37`	`+ .setWriteEnqueuingTimeoutInMs(nioParams.getWriteEnqueuingTimeoutInMs() * 3)`
	`38`	`+ .setWriteQueueCapacity(nioParams.getWriteQueueCapacity() * 2);`
`38`	`39`	`}`
`39`	`40`
`40`	`41`	`protected void declareQueue() throws IOException {`