Allows more time for server startup during smoke tests
diff --git a/org.eclipse.virgo.test.tools/src/main/java/org/eclipse/virgo/test/tools/AbstractSmokeTests.java b/org.eclipse.virgo.test.tools/src/main/java/org/eclipse/virgo/test/tools/AbstractSmokeTests.java
index 3c91176..ca4fdcb 100644
--- a/org.eclipse.virgo.test.tools/src/main/java/org/eclipse/virgo/test/tools/AbstractSmokeTests.java
+++ b/org.eclipse.virgo.test.tools/src/main/java/org/eclipse/virgo/test/tools/AbstractSmokeTests.java
@@ -13,6 +13,7 @@
import static java.util.concurrent.TimeUnit.SECONDS;
import static org.eclipse.virgo.test.tools.JmxUtils.isDefaultJmxPortAvailable;
+import static org.eclipse.virgo.test.tools.JmxUtils.waitForVirgoServerShutdownFully;
import static org.eclipse.virgo.test.tools.JmxUtils.waitForVirgoServerStartFully;
import static org.eclipse.virgo.test.tools.VirgoServerShutdownThread.shutdown;
import static org.eclipse.virgo.test.tools.VirgoServerStartupThread.startup;
@@ -54,7 +55,7 @@
@After
public void shutdownServer() throws Exception {
shutdown(ServerUtils.getBinDir(getVirgoFlavor()));
- assertTrue("Server '" + getVirgoFlavor() + "' not shut down properly.", JmxUtils.waitForVirgoServerShutdownFully());
+ assertTrue("Server '" + getVirgoFlavor() + "' not shut down properly.", waitForVirgoServerShutdownFully());
}
private File setupBundleResourcesDir() {
diff --git a/org.eclipse.virgo.test.tools/src/main/java/org/eclipse/virgo/test/tools/JmxUtils.java b/org.eclipse.virgo.test.tools/src/main/java/org/eclipse/virgo/test/tools/JmxUtils.java
index 524bfc5..25d18e2 100644
--- a/org.eclipse.virgo.test.tools/src/main/java/org/eclipse/virgo/test/tools/JmxUtils.java
+++ b/org.eclipse.virgo.test.tools/src/main/java/org/eclipse/virgo/test/tools/JmxUtils.java
@@ -79,7 +79,7 @@
switch (currentKernelStatus) {
case STATUS_STARTED:
// wait for startup to complete
- SECONDS.sleep(15);
+ SECONDS.sleep(20);
return true;
case STATUS_STARTING:
default:
@@ -99,7 +99,7 @@
while (start.plus(THIRTY_SECONDS).isAfter(now())) {
if (isDefaultJmxPortAvailable()) {
// allow some more time to finish shutdown
- SECONDS.sleep(5);
+ SECONDS.sleep(10);
return true;
}
try {
