You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by or...@apache.org on 2017/06/05 09:22:12 UTC

qpid-broker-j git commit: QPID-7808: Fix test ProducerFlowControlTest#testProducerFlowControlIsTriggeredOnEnqueueAsPartOfAsyncTransaction for non-persistent test profiles

Repository: qpid-broker-j
Updated Branches:
  refs/heads/master 60f062201 -> 673adc12b


QPID-7808: Fix test ProducerFlowControlTest#testProducerFlowControlIsTriggeredOnEnqueueAsPartOfAsyncTransaction for non-persistent test profiles


Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/673adc12
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/673adc12
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/673adc12

Branch: refs/heads/master
Commit: 673adc12b0791a866df233a64a090af593400d02
Parents: 60f0622
Author: Alex Rudyy <or...@apache.org>
Authored: Mon Jun 5 10:20:05 2017 +0100
Committer: Alex Rudyy <or...@apache.org>
Committed: Mon Jun 5 10:20:21 2017 +0100

----------------------------------------------------------------------
 .../apache/qpid/server/queue/ProducerFlowControlTest.java | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/673adc12/systests/src/test/java/org/apache/qpid/server/queue/ProducerFlowControlTest.java
----------------------------------------------------------------------
diff --git a/systests/src/test/java/org/apache/qpid/server/queue/ProducerFlowControlTest.java b/systests/src/test/java/org/apache/qpid/server/queue/ProducerFlowControlTest.java
index 6b9cee7..ab10acc 100644
--- a/systests/src/test/java/org/apache/qpid/server/queue/ProducerFlowControlTest.java
+++ b/systests/src/test/java/org/apache/qpid/server/queue/ProducerFlowControlTest.java
@@ -72,12 +72,17 @@ public class ProducerFlowControlTest extends AbstractTestLogging
     {
         getDefaultBrokerConfiguration().addHttpManagementConfiguration();
         super.setUp();
+    }
 
-        _restTestHelper = new RestTestHelper(getDefaultBroker().getHttpPort());
+    public void startDefaultBroker()
+    {
+        // broker start-up is delegated to the tests
     }
 
     private void init() throws Exception
     {
+        super.startDefaultBroker();
+        _restTestHelper = new RestTestHelper(getDefaultBroker().getHttpPort());
         _monitor.markDiscardPoint();
 
         if (!isBroker10())
@@ -315,8 +320,9 @@ public class ProducerFlowControlTest extends AbstractTestLogging
     {
         long oneHourMilliseconds = 60 * 60 * 1000L;
         setSystemProperty("virtualhost.housekeepingCheckPeriod", String.valueOf(oneHourMilliseconds));
+        super.startDefaultBroker();
+        _restTestHelper = new RestTestHelper(getDefaultBroker().getHttpPort());
 
-        restartDefaultBroker();
         Connection connection = getConnection();
         Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
 


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