You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2017/08/01 09:36:53 UTC
[1/2] qpid-broker-j git commit: NO-JIRA: [System Tests] Increase
wiggle room when closing connection on Apache CI
Repository: qpid-broker-j
Updated Branches:
refs/heads/master 94c9e5ba2 -> 6666a3f33
NO-JIRA: [System Tests] Increase wiggle room when closing connection on Apache CI
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/e4051d8e
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/e4051d8e
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/e4051d8e
Branch: refs/heads/master
Commit: e4051d8e75917c8c6efdc0e222a3cb8df456f301
Parents: 94c9e5b
Author: Keith Wall <kw...@apache.org>
Authored: Tue Aug 1 10:35:14 2017 +0100
Committer: Keith Wall <kw...@apache.org>
Committed: Tue Aug 1 10:35:14 2017 +0100
----------------------------------------------------------------------
test-profiles/apache-ci.test.overridden.properties | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/e4051d8e/test-profiles/apache-ci.test.overridden.properties
----------------------------------------------------------------------
diff --git a/test-profiles/apache-ci.test.overridden.properties b/test-profiles/apache-ci.test.overridden.properties
index 89d1ece..156b3f3 100644
--- a/test-profiles/apache-ci.test.overridden.properties
+++ b/test-profiles/apache-ci.test.overridden.properties
@@ -19,6 +19,9 @@
#
#
+# AMQP 0-9..0-10 - extend length of time allowed to close a connection
+qpid.close_timeout=10000
+
qpid.port.protocol_handshake_timeout=10000
SpawnedBrokerHolder.brokerStartupTime=60000
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[2/2] qpid-broker-j git commit: NO-JIRA: [System Tests] Remove the
starting of a redundant internal broker from SpawnedBrokerHolderTest
Posted by kw...@apache.org.
NO-JIRA: [System Tests] Remove the starting of a redundant internal broker from SpawnedBrokerHolderTest
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/6666a3f3
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/6666a3f3
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/6666a3f3
Branch: refs/heads/master
Commit: 6666a3f3322e56528fd4b57a20811103ffe670cd
Parents: e4051d8
Author: Keith Wall <kw...@apache.org>
Authored: Tue Aug 1 10:36:27 2017 +0100
Committer: Keith Wall <kw...@apache.org>
Committed: Tue Aug 1 10:36:27 2017 +0100
----------------------------------------------------------------------
.../java/org/apache/qpid/test/utils/SpawnedBrokerHolder.java | 5 +++--
.../org/apache/qpid/test/utils/SpawnedBrokerHolderTest.java | 6 ++++++
2 files changed, 9 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/6666a3f3/systests/src/main/java/org/apache/qpid/test/utils/SpawnedBrokerHolder.java
----------------------------------------------------------------------
diff --git a/systests/src/main/java/org/apache/qpid/test/utils/SpawnedBrokerHolder.java b/systests/src/main/java/org/apache/qpid/test/utils/SpawnedBrokerHolder.java
index 01b9187..bce8ba8 100644
--- a/systests/src/main/java/org/apache/qpid/test/utils/SpawnedBrokerHolder.java
+++ b/systests/src/main/java/org/apache/qpid/test/utils/SpawnedBrokerHolder.java
@@ -178,8 +178,9 @@ public class SpawnedBrokerHolder extends AbstractBrokerHolder
}
//Ensure broker has stopped
_process.destroy();
- throw new RuntimeException("broker failed to become ready:"
- + standardOutputPiper.getStopLine());
+ throw new RuntimeException(String.format("Broker failed to become ready within %d ms. Stop line : %s",
+ BROKER_STARTUP_TIME,
+ standardOutputPiper.getStopLine()));
}
_windowsPids = retrieveWindowsPidsIfPossible();
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/6666a3f3/systests/src/test/java/org/apache/qpid/test/utils/SpawnedBrokerHolderTest.java
----------------------------------------------------------------------
diff --git a/systests/src/test/java/org/apache/qpid/test/utils/SpawnedBrokerHolderTest.java b/systests/src/test/java/org/apache/qpid/test/utils/SpawnedBrokerHolderTest.java
index e5443bf..237f9a4 100644
--- a/systests/src/test/java/org/apache/qpid/test/utils/SpawnedBrokerHolderTest.java
+++ b/systests/src/test/java/org/apache/qpid/test/utils/SpawnedBrokerHolderTest.java
@@ -21,6 +21,12 @@ package org.apache.qpid.test.utils;
public class SpawnedBrokerHolderTest extends QpidBrokerTestCase
{
+ @Override
+ public void startDefaultBroker() throws Exception
+ {
+ // Don't start default broker
+ }
+
public void testRestartOnSamePort() throws Exception
{
BrokerHolder broker = createSpawnedBroker();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org