You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rg...@apache.org on 2016/11/29 15:32:39 UTC

svn commit: r1771918 - in /qpid/java/trunk: systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java test-profiles/Java10BrokenTestsExcludes test-profiles/Java10Excludes

Author: rgodfrey
Date: Tue Nov 29 15:32:39 2016
New Revision: 1771918

URL: http://svn.apache.org/viewvc?rev=1771918&view=rev
Log:
QPID-7546 : EnsureNondestructiveConsumersTest

Modified:
    qpid/java/trunk/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
    qpid/java/trunk/test-profiles/Java10BrokenTestsExcludes
    qpid/java/trunk/test-profiles/Java10Excludes

Modified: qpid/java/trunk/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java?rev=1771918&r1=1771917&r2=1771918&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java (original)
+++ qpid/java/trunk/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java Tue Nov 29 15:32:39 2016
@@ -1054,9 +1054,16 @@ public class QpidBrokerTestCase extends
 
     protected Connection getConnectionWithSyncPublishing() throws URLSyntaxException, NamingException, JMSException
     {
-        Map<String, String> options = new HashMap<>();
-        options.put(ConnectionURL.OPTIONS_SYNC_PUBLISH, "all");
-        return getConnectionWithOptions(options);
+        if(isBroker10())
+        {
+            return getConnection();
+        }
+        else
+        {
+            Map<String, String> options = new HashMap<>();
+            options.put(ConnectionURL.OPTIONS_SYNC_PUBLISH, "all");
+            return getConnectionWithOptions(options);
+        }
     }
 
     protected Connection getClientConnection(String username, String password, String id)

Modified: qpid/java/trunk/test-profiles/Java10BrokenTestsExcludes
URL: http://svn.apache.org/viewvc/qpid/java/trunk/test-profiles/Java10BrokenTestsExcludes?rev=1771918&r1=1771917&r2=1771918&view=diff
==============================================================================
--- qpid/java/trunk/test-profiles/Java10BrokenTestsExcludes (original)
+++ qpid/java/trunk/test-profiles/Java10BrokenTestsExcludes Tue Nov 29 15:32:39 2016
@@ -99,5 +99,5 @@ org.apache.qpid.server.queue.ConsumerPri
 org.apache.qpid.server.queue.ArrivalTimeFilterTest#*
 
 // Broker should issue drain to client when flow control is enforced, so that existing credit is used up (test will also need updating)
-//org.apache.qpid.server.queue.ProducerFlowControlTest#*
+org.apache.qpid.server.queue.ProducerFlowControlTest#*
 

Modified: qpid/java/trunk/test-profiles/Java10Excludes
URL: http://svn.apache.org/viewvc/qpid/java/trunk/test-profiles/Java10Excludes?rev=1771918&r1=1771917&r2=1771918&view=diff
==============================================================================
--- qpid/java/trunk/test-profiles/Java10Excludes (original)
+++ qpid/java/trunk/test-profiles/Java10Excludes Tue Nov 29 15:32:39 2016
@@ -163,3 +163,4 @@ org.apache.qpid.test.client.message.JMSX
 
 
 
+



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org