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

Fixes testCreateAndRunAService by fixing the outdated jetty URL

This commit is contained in:
zack-shoylev 2013-06-14 18:08:02 -05:00 committed by Everett Toews
parent 451c4326a2
commit bcf8e3fe50
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
compute/src/test/java/org/jclouds/compute/JettyStatements.java
View File

@ -33,8 +33,8 @@ import org.jclouds.scriptbuilder.statements.login.AdminAccess;
*/ */
public class JettyStatements { public class JettyStatements {
public static final URI JETTY_URL = URI.create(System.getProperty("test.jetty-url",// public static final URI JETTY_URL = URI.create(System.getProperty("test.jetty-url",
"http://download.eclipse.org/jetty/8.1.8.v20121106/dist/jetty-distribution-8.1.8.v20121106.tar.gz")); "http://archive.eclipse.org/jetty/8.1.8.v20121106/dist/jetty-distribution-8.1.8.v20121106.tar.gz"));
public static final String JETTY_HOME = "/usr/local/jetty"; public static final String JETTY_HOME = "/usr/local/jetty";

2
compute/src/test/java/org/jclouds/compute/internal/BaseComputeServiceLiveTest.java
View File

@ -633,7 +633,7 @@ public abstract class BaseComputeServiceLiveTest extends BaseComputeServiceConte
HostAndPort socket = null; HostAndPort socket = null;
try { try {
socket = openSocketFinder.findOpenSocketOnNode(node, 8080, 60, TimeUnit.SECONDS); socket = openSocketFinder.findOpenSocketOnNode(node, 8080, 600, TimeUnit.SECONDS);
} catch (NoSuchElementException e) { } catch (NoSuchElementException e) {
throw new NoSuchElementException(format("%s%n%s%s", e.getMessage(), exec.getOutput(), exec.getError())); throw new NoSuchElementException(format("%s%n%s%s", e.getMessage(), exec.getOutput(), exec.getError()));
} }

2
compute/src/test/resources/initscript_with_jetty.sh
View File

@ -228,7 +228,7 @@ END_OF_JCLOUDS_SCRIPT
iptables -I INPUT 1 -p tcp --dport 8080 -j ACCEPT iptables -I INPUT 1 -p tcp --dport 8080 -j ACCEPT
iptables-save iptables-save
mkdir /tmp/$$ mkdir /tmp/$$
curl -q -s -S -L --connect-timeout 10 --max-time 600 --retry 20 -X GET http://download.eclipse.org/jetty/8.1.8.v20121106/dist/jetty-distribution-8.1.8.v20121106.tar.gz |(mkdir -p /tmp/$$ &&cd /tmp/$$ &&tar -xpzf -) curl -q -s -S -L --connect-timeout 10 --max-time 600 --retry 20 -X GET http://archive.eclipse.org/jetty/8.1.8.v20121106/dist/jetty-distribution-8.1.8.v20121106.tar.gz |(mkdir -p /tmp/$$ &&cd /tmp/$$ &&tar -xpzf -)
mkdir -p /usr/local/jetty mkdir -p /usr/local/jetty
mv /tmp/$$/*/* /usr/local/jetty mv /tmp/$$/*/* /usr/local/jetty
rm -rf /tmp/$$ rm -rf /tmp/$$

2
providers/cloudservers-uk/src/test/java/org/jclouds/rackspace/cloudservers/compute/CloudServersUKComputeServiceLiveTest.java
View File

@ -23,7 +23,7 @@ import org.testng.annotations.Test;
* *
* @author Adrian Cole * @author Adrian Cole
*/ */
@Test(groups = "live", sequential = true, testName = "CloudServersUKComputeServiceLiveTest") @Test(groups = "live", singleThreaded = true, testName = "CloudServersUKComputeServiceLiveTest")
public class CloudServersUKComputeServiceLiveTest extends CloudServersComputeServiceLiveTest { public class CloudServersUKComputeServiceLiveTest extends CloudServersComputeServiceLiveTest {
public CloudServersUKComputeServiceLiveTest() { public CloudServersUKComputeServiceLiveTest() {