diff options
author | Keith Wall <kwall@apache.org> | 2014-05-20 14:39:53 +0000 |
---|---|---|
committer | Keith Wall <kwall@apache.org> | 2014-05-20 14:39:53 +0000 |
commit | b8ea492a1651b86fde5ae93d4e40c3987b9eaa4a (patch) | |
tree | 2fe0243c11edcf370d165ec020e02b8b72f66956 /qpid/java/systests/src/main/java | |
parent | e7eafff56e6a1b67e7aafe7725956c93b7eec379 (diff) | |
download | qpid-python-b8ea492a1651b86fde5ae93d4e40c3987b9eaa4a.tar.gz |
NO-JIRA: [Java Broker] Add extra assertions to PortRestTest to help investigate sporadic test failure on some CI environments
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1596269 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/systests/src/main/java')
-rw-r--r-- | qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/PortRestTest.java | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/PortRestTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/PortRestTest.java index 7bf374e100..f056cf9ae1 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/PortRestTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/PortRestTest.java @@ -123,7 +123,8 @@ public class PortRestTest extends QpidRestTestCase String portNameJMX = "test-port-jmx"; attributes = new HashMap<String, Object>(); attributes.put(Port.NAME, portNameJMX); - attributes.put(Port.PORT, getNextAvailable(rmiPort + 1)); + int jmxPort = getNextAvailable(rmiPort + 1); + attributes.put(Port.PORT, jmxPort); attributes.put(Port.PROTOCOLS, Collections.singleton(Protocol.JMX_RMI)); attributes.put(JmxPort.AUTHENTICATION_PROVIDER, TestBrokerConfiguration.ENTRY_NAME_AUTHENTICATION_PROVIDER); @@ -144,9 +145,17 @@ public class PortRestTest extends QpidRestTestCase assertEquals("Unexpected response code", 201, responseCode); - // make sure that port is there after broker restart - restartBroker(); + stopBroker(); + + // Temporary code to investigate sporadic test failure. + boolean rmiIsFree = getNextAvailable(rmiPort) == rmiPort; + boolean jmxIsFree = getNextAvailable(jmxPort) == jmxPort; + + assertTrue("Expecting rmiPort to be free after broker stop", rmiIsFree); + assertTrue("Expecting jmxPort to be free after broker stop", jmxIsFree); + + startBroker(); portDetails = getRestTestHelper().getJsonAsList("port/" + portNameRMI); assertNotNull("Port details cannot be null", portDetails); |