Repository: jclouds Updated Branches: refs/heads/2.0.x 3b5fe0b02 -> 5b57b73cf
Makes sure Jetty doesn't terminate on ssh disconnect Fixes BaseComputeServiceAdapterLiveTest.testCreateAndRunAService for CentOS 7. disown in jetty.sh is not enough to detach the process from the current session so it's terminated when jclouds closes the connection. Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/5b57b73c Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/5b57b73c Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/5b57b73c Branch: refs/heads/2.0.x Commit: 5b57b73cf744cd316c028edd2e5d765324ec6d6f Parents: 3b5fe0b Author: Svetoslav Neykov <[email protected]> Authored: Thu Jul 20 10:14:50 2017 +0300 Committer: Svetoslav Neykov <[email protected]> Committed: Thu Jul 20 16:50:00 2017 +0300 ---------------------------------------------------------------------- compute/src/test/java/org/jclouds/compute/JettyStatements.java | 2 +- .../org/jclouds/compute/StubComputeServiceIntegrationTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/5b57b73c/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 63adf97..9f4aeb6 100644 --- a/compute/src/test/java/org/jclouds/compute/JettyStatements.java +++ b/compute/src/test/java/org/jclouds/compute/JettyStatements.java @@ -57,7 +57,7 @@ public class JettyStatements { public static Statement start() { return new StatementList( - literal(String.format("JETTY_PORT=%d %s/bin/jetty.sh start", port, JETTY_HOME)), + literal(String.format("JETTY_PORT=%d nohup %s/bin/jetty.sh start > start.log 2>&1 < /dev/null &", port, JETTY_HOME)), literal("test $? && sleep 1")); // in case it is slow starting the proc } http://git-wip-us.apache.org/repos/asf/jclouds/blob/5b57b73c/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 9f20d65..392989c 100644 --- a/compute/src/test/java/org/jclouds/compute/StubComputeServiceIntegrationTest.java +++ b/compute/src/test/java/org/jclouds/compute/StubComputeServiceIntegrationTest.java @@ -303,7 +303,7 @@ public class StubComputeServiceIntegrationTest extends BaseComputeServiceLiveTes clientNew.disconnect(); String startJetty = new StringBuilder() - .append("JETTY_PORT=8080 /usr/local/jetty/bin/jetty.sh start").append('\n') + .append("JETTY_PORT=8080 nohup /usr/local/jetty/bin/jetty.sh start > start.log 2>&1 < /dev/null &").append('\n') .append("test $? && sleep 1").append('\n').toString(); clientNew.connect();
