You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by ev...@apache.org on 2013/07/02 02:48:35 UTC
git commit: Fixes testCreateAndRunAService by fixing the outdated
jetty URL
Updated Branches:
refs/heads/1.6.x 162379aae -> 3731f812c
Fixes testCreateAndRunAService by fixing the outdated jetty URL
Project: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/commit/3731f812
Tree: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/tree/3731f812
Diff: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/diff/3731f812
Branch: refs/heads/1.6.x
Commit: 3731f812cb16e74ddddf07ed9f536b3abbf5d681
Parents: 162379a
Author: Zack Shoylev <za...@rackspace.com>
Authored: Fri Jun 14 18:08:02 2013 -0500
Committer: Everett Toews <ev...@rackspace.com>
Committed: Mon Jul 1 19:48:05 2013 -0500
----------------------------------------------------------------------
compute/src/test/java/org/jclouds/compute/JettyStatements.java | 4 ++--
.../org/jclouds/compute/internal/BaseComputeServiceLiveTest.java | 2 +-
compute/src/test/resources/initscript_with_jetty.sh | 2 +-
.../compute/CloudServersUKComputeServiceLiveTest.java | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/3731f812/compute/src/test/java/org/jclouds/compute/JettyStatements.java
----------------------------------------------------------------------
diff --git a/compute/src/test/java/org/jclouds/compute/JettyStatements.java b/compute/src/test/java/org/jclouds/compute/JettyStatements.java
index 9680518..ff79541 100644
--- a/compute/src/test/java/org/jclouds/compute/JettyStatements.java
+++ b/compute/src/test/java/org/jclouds/compute/JettyStatements.java
@@ -33,8 +33,8 @@ import org.jclouds.scriptbuilder.statements.login.AdminAccess;
*/
public class JettyStatements {
- 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"));
+ public static final URI JETTY_URL = URI.create(System.getProperty("test.jetty-url",
+ "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";
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/3731f812/compute/src/test/java/org/jclouds/compute/internal/BaseComputeServiceLiveTest.java
----------------------------------------------------------------------
diff --git a/compute/src/test/java/org/jclouds/compute/internal/BaseComputeServiceLiveTest.java b/compute/src/test/java/org/jclouds/compute/internal/BaseComputeServiceLiveTest.java
index 493381f..f7d3000 100644
--- a/compute/src/test/java/org/jclouds/compute/internal/BaseComputeServiceLiveTest.java
+++ b/compute/src/test/java/org/jclouds/compute/internal/BaseComputeServiceLiveTest.java
@@ -630,7 +630,7 @@ public abstract class BaseComputeServiceLiveTest extends BaseComputeServiceConte
HostAndPort socket = null;
try {
- socket = openSocketFinder.findOpenSocketOnNode(node, 8080, 60, TimeUnit.SECONDS);
+ socket = openSocketFinder.findOpenSocketOnNode(node, 8080, 600, TimeUnit.SECONDS);
} catch (NoSuchElementException e) {
throw new NoSuchElementException(format("%s%n%s%s", e.getMessage(), exec.getOutput(), exec.getError()));
}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/3731f812/compute/src/test/resources/initscript_with_jetty.sh
----------------------------------------------------------------------
diff --git a/compute/src/test/resources/initscript_with_jetty.sh b/compute/src/test/resources/initscript_with_jetty.sh
index d5a5e3d..fca9683 100644
--- a/compute/src/test/resources/initscript_with_jetty.sh
+++ b/compute/src/test/resources/initscript_with_jetty.sh
@@ -228,7 +228,7 @@ END_OF_JCLOUDS_SCRIPT
iptables -I INPUT 1 -p tcp --dport 8080 -j ACCEPT
iptables-save
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
mv /tmp/$$/*/* /usr/local/jetty
rm -rf /tmp/$$
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/3731f812/providers/cloudservers-uk/src/test/java/org/jclouds/rackspace/cloudservers/compute/CloudServersUKComputeServiceLiveTest.java
----------------------------------------------------------------------
diff --git a/providers/cloudservers-uk/src/test/java/org/jclouds/rackspace/cloudservers/compute/CloudServersUKComputeServiceLiveTest.java b/providers/cloudservers-uk/src/test/java/org/jclouds/rackspace/cloudservers/compute/CloudServersUKComputeServiceLiveTest.java
index c4b2f6c..91a9830 100644
--- a/providers/cloudservers-uk/src/test/java/org/jclouds/rackspace/cloudservers/compute/CloudServersUKComputeServiceLiveTest.java
+++ b/providers/cloudservers-uk/src/test/java/org/jclouds/rackspace/cloudservers/compute/CloudServersUKComputeServiceLiveTest.java
@@ -23,7 +23,7 @@ import org.testng.annotations.Test;
*
* @author Adrian Cole
*/
-@Test(groups = "live", sequential = true, testName = "CloudServersUKComputeServiceLiveTest")
+@Test(groups = "live", singleThreaded = true, testName = "CloudServersUKComputeServiceLiveTest")
public class CloudServersUKComputeServiceLiveTest extends CloudServersComputeServiceLiveTest {
public CloudServersUKComputeServiceLiveTest() {