Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

have more tests wait for the jetty listener - intermittent failures in hudson 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@918553 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Gary Tully 2010-03-03 16:31:27 +00:00
parent f82dc25eae
commit a21226c222
4 changed files with 52 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
activemq-optional/src/test/java/org/apache/activemq/transport/http/HttpJmsDurableTopicSendReceiveTest.java
View File

@ -29,6 +29,7 @@ public class HttpJmsDurableTopicSendReceiveTest extends JmsDurableTopicSendRecei
broker.start();
}
super.setUp();
WaitForJettyListener.waitForJettySocketToAccept(getBrokerURL());
}
protected void tearDown() throws Exception {

1
activemq-optional/src/test/java/org/apache/activemq/transport/http/HttpJmsSendAndReceiveTest.java
View File

@ -32,6 +32,7 @@ public class HttpJmsSendAndReceiveTest extends JmsTopicSendReceiveWithTwoConnect
broker.start();
}
super.setUp();
WaitForJettyListener.waitForJettySocketToAccept(getBrokerURL());
}
protected void tearDown() throws Exception {

28
activemq-optional/src/test/java/org/apache/activemq/transport/http/HttpTransportBrokerTest.java
View File

@ -16,11 +16,7 @@
*/
package org.apache.activemq.transport.http;
import java.net.Socket;
import java.net.URI;
import java.net.URL;
import javax.net.SocketFactory;
import junit.framework.Test;
import junit.textui.TestRunner;
@ -28,13 +24,9 @@ import junit.textui.TestRunner;
import org.apache.activemq.broker.BrokerFactory;
import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.transport.TransportBrokerTestSupport;
import org.apache.activemq.util.Wait;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
public class HttpTransportBrokerTest extends TransportBrokerTestSupport {
private static final Log LOG = LogFactory.getLog(HttpTransportBrokerTest.class);
protected String getBindLocation() {
return "http://localhost:8081";
}
@ -42,25 +34,7 @@ public class HttpTransportBrokerTest extends TransportBrokerTestSupport {
protected void setUp() throws Exception {
maxWait = 2000;
super.setUp();
waitForJettySocketToAccept(getBindLocation());
}
private void waitForJettySocketToAccept(String bindLocation) throws Exception {
final URL url = new URL(bindLocation);
assertTrue("Jetty endpoint is available", Wait.waitFor(new Wait.Condition() {
public boolean isSatisified() throws Exception {
boolean canConnect = false;
try {
Socket socket = SocketFactory.getDefault().createSocket(url.getHost(), url.getPort());
socket.close();
canConnect = true;
} catch (Exception e) {
LOG.warn("verify jettty available, failed to connect to " + url + e);
}
return canConnect;
}}, 60 * 1000));
WaitForJettyListener.waitForJettySocketToAccept(getBindLocation());
}
protected BrokerService createBroker() throws Exception {

49
activemq-optional/src/test/java/org/apache/activemq/transport/http/WaitForJettyListener.java Normal file
View File

@ -0,0 +1,49 @@
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.activemq.transport.http;
import java.net.Socket;
import java.net.URL;
import javax.net.SocketFactory;
import org.apache.activemq.util.Wait;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import static junit.framework.Assert.assertTrue;
public class WaitForJettyListener {
private static final Log LOG = LogFactory.getLog(WaitForJettyListener.class);
public static void waitForJettySocketToAccept(String bindLocation) throws Exception {
final URL url = new URL(bindLocation);
assertTrue("Jetty endpoint is available", Wait.waitFor(new Wait.Condition() {
public boolean isSatisified() throws Exception {
boolean canConnect = false;
try {
Socket socket = SocketFactory.getDefault().createSocket(url.getHost(), url.getPort());
socket.close();
canConnect = true;
} catch (Exception e) {
LOG.warn("verify jettty available, failed to connect to " + url + e);
}
return canConnect;
}}, 60 * 1000));
}
}