SLING-11631 The waitForQuietPeriod pause should only happen once
diff --git a/src/main/java/org/apache/sling/testing/serversetup/instance/SlingInstanceState.java b/src/main/java/org/apache/sling/testing/serversetup/instance/SlingInstanceState.java
index f230a41..0337889 100644
--- a/src/main/java/org/apache/sling/testing/serversetup/instance/SlingInstanceState.java
+++ b/src/main/java/org/apache/sling/testing/serversetup/instance/SlingInstanceState.java
@@ -40,6 +40,7 @@
private boolean startupInfoProvided = false;
private boolean serverInfoLogged = false;
private JarExecutor jarExecutor;
+ private boolean quietPeriodComplete = false;
/**
* List of the urls of currently started servers
@@ -140,4 +141,13 @@
public void setServerBaseUrl(String serverBaseUrl) {
this.serverBaseUrl = serverBaseUrl;
}
-}
\ No newline at end of file
+
+ public boolean isQuietPeriodComplete() {
+ return quietPeriodComplete;
+ }
+
+ public void setQuietPeriodComplete(boolean quietPeriodComplete) {
+ this.quietPeriodComplete = quietPeriodComplete;
+ }
+
+}
diff --git a/src/main/java/org/apache/sling/testing/serversetup/instance/SlingTestBase.java b/src/main/java/org/apache/sling/testing/serversetup/instance/SlingTestBase.java
index 136edfd..1c20626 100644
--- a/src/main/java/org/apache/sling/testing/serversetup/instance/SlingTestBase.java
+++ b/src/main/java/org/apache/sling/testing/serversetup/instance/SlingTestBase.java
@@ -188,6 +188,10 @@
* doing the startup and install additional bundles work.
*/
protected void waitForQuietPeriod() throws InterruptedException {
+ if (slingTestState.isQuietPeriodComplete()) {
+ // already waited, so no need to do that again
+ return;
+ }
final String quietPeriodSecProp = systemProperties.getProperty(SERVER_READY_QUIET_PERIOD_PROP, "0");
final int quietPeriodSec = TimeoutsProvider.getInstance().getTimeout(Integer.valueOf(quietPeriodSecProp));
final int quietPeriodMs = quietPeriodSec * 1000;
@@ -195,6 +199,7 @@
log.info("Waiting {} seconds as a quiet period", quietPeriodSec);
Thread.sleep(quietPeriodMs);
}
+ slingTestState.setQuietPeriodComplete(true);
}
protected void installAdditionalBundles() {
