Repository: jclouds Updated Branches: refs/heads/2.0.x 499e61b80 -> 8c2e7435d
Fix the Jetty start statement used in compute live tests Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/8c2e7435 Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/8c2e7435 Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/8c2e7435 Branch: refs/heads/2.0.x Commit: 8c2e7435dafd7ba29467da249d9455afd9466407 Parents: 499e61b Author: Ignasi Barrera <[email protected]> Authored: Thu Apr 20 10:01:51 2017 +0200 Committer: Ignasi Barrera <[email protected]> Committed: Thu Apr 20 10:01:51 2017 +0200 ---------------------------------------------------------------------- .../test/java/org/jclouds/compute/JettyStatements.java | 7 ++----- .../compute/StubComputeServiceIntegrationTest.java | 10 +++++++--- .../compute/internal/BaseComputeServiceLiveTest.java | 6 +++++- 3 files changed, 14 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/8c2e7435/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 7ac0f8c..63adf97 100644 --- a/compute/src/test/java/org/jclouds/compute/JettyStatements.java +++ b/compute/src/test/java/org/jclouds/compute/JettyStatements.java @@ -57,14 +57,11 @@ public class JettyStatements { public static Statement start() { return new StatementList( - literal("cd " + JETTY_HOME), - literal("nohup java -jar start.jar jetty.port=" + port + " > start.out 2> start.err < /dev/null &"), + literal(String.format("JETTY_PORT=%d %s/bin/jetty.sh start", port, JETTY_HOME)), literal("test $? && sleep 1")); // in case it is slow starting the proc } public static Statement stop() { - return new StatementList( - literal("cd " + JETTY_HOME), - literal("./bin/jetty.sh stop")); + return literal(JETTY_HOME + "/bin/jetty.sh stop"); } } http://git-wip-us.apache.org/repos/asf/jclouds/blob/8c2e7435/compute/src/test/java/org/jclouds/compute/StubComputeServiceIntegrationTest.java ---------------------------------------------------------------------- diff --git a/compute/src/test/java/org/jclouds/compute/StubComputeServiceIntegrationTest.java b/compute/src/test/java/org/jclouds/compute/StubComputeServiceIntegrationTest.java index e2468e3..9f20d65 100644 --- a/compute/src/test/java/org/jclouds/compute/StubComputeServiceIntegrationTest.java +++ b/compute/src/test/java/org/jclouds/compute/StubComputeServiceIntegrationTest.java @@ -303,8 +303,7 @@ public class StubComputeServiceIntegrationTest extends BaseComputeServiceLiveTes clientNew.disconnect(); String startJetty = new StringBuilder() - .append("cd /usr/local/jetty").append('\n') - .append("nohup java -jar start.jar jetty.port=8080 > start.out 2> start.err < /dev/null &").append('\n') + .append("JETTY_PORT=8080 /usr/local/jetty/bin/jetty.sh start").append('\n') .append("test $? && sleep 1").append('\n').toString(); clientNew.connect(); @@ -312,7 +311,7 @@ public class StubComputeServiceIntegrationTest extends BaseComputeServiceLiveTes clientNew.disconnect(); clientNew.connect(); - expect(clientNew.exec("cd /usr/local/jetty\n./bin/jetty.sh stop\n")).andReturn(EXEC_GOOD); + expect(clientNew.exec("/usr/local/jetty/bin/jetty.sh stop\n")).andReturn(EXEC_GOOD); clientNew.disconnect(); clientNew.connect(); @@ -534,4 +533,9 @@ public class StubComputeServiceIntegrationTest extends BaseComputeServiceLiveTes super.testDestroyNodes(); } + @Override + protected void waitGracePeriodForDestroyedNodes() { + // Do not wait + } + } http://git-wip-us.apache.org/repos/asf/jclouds/blob/8c2e7435/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 9e41a64..e90fd4f 100644 --- a/compute/src/test/java/org/jclouds/compute/internal/BaseComputeServiceLiveTest.java +++ b/compute/src/test/java/org/jclouds/compute/internal/BaseComputeServiceLiveTest.java @@ -684,7 +684,7 @@ public abstract class BaseComputeServiceLiveTest extends BaseComputeServiceConte int toDestroy = refreshNodes().size(); Set<? extends NodeMetadata> destroyed = client.destroyNodesMatching(inGroup(group)); assertEquals(toDestroy, destroyed.size()); - Uninterruptibles.sleepUninterruptibly(100, TimeUnit.SECONDS); + waitGracePeriodForDestroyedNodes(); for (NodeMetadata node : filter(client.listNodesDetailsMatching(all()), inGroup(group))) { assert node.getStatus() == Status.TERMINATED : node; assert view.utils().credentialStore().get("node#" + node.getId()) == null : "credential should have been null for " @@ -692,6 +692,10 @@ public abstract class BaseComputeServiceLiveTest extends BaseComputeServiceConte } } + protected void waitGracePeriodForDestroyedNodes() { + Uninterruptibles.sleepUninterruptibly(100, TimeUnit.SECONDS); + } + private Set<? extends NodeMetadata> refreshNodes() { return filter(client.listNodesDetailsMatching(all()), and(inGroup(group), not(TERMINATED))); }
