You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by en...@apache.org on 2020/09/22 18:14:21 UTC
[sling-org-apache-sling-testing-serversetup] branch master updated:
SLING-9759 convert the bundle install and start timeout system property
values to milliseconds
This is an automated email from the ASF dual-hosted git repository.
enorman pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-serversetup.git
The following commit(s) were added to refs/heads/master by this push:
new a3c6653 SLING-9759 convert the bundle install and start timeout system property values to milliseconds
a3c6653 is described below
commit a3c6653d2f56cafa22ecebedd7792c6009254a42
Author: Eric Norman <en...@apache.org>
AuthorDate: Tue Sep 22 11:14:11 2020 -0700
SLING-9759 convert the bundle install and start timeout system property
values to milliseconds
---
.../testing/serversetup/StartRunnableJarPhase.java | 1 -
.../serversetup/instance/SlingInstanceManager.java | 1 -
.../serversetup/instance/SlingTestBase.java | 24 +++++++++++++---------
.../testing/serversetup/jarexec/JarExecutor.java | 1 -
4 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/src/main/java/org/apache/sling/testing/serversetup/StartRunnableJarPhase.java b/src/main/java/org/apache/sling/testing/serversetup/StartRunnableJarPhase.java
index d5547df..2ed6eb9 100644
--- a/src/main/java/org/apache/sling/testing/serversetup/StartRunnableJarPhase.java
+++ b/src/main/java/org/apache/sling/testing/serversetup/StartRunnableJarPhase.java
@@ -19,7 +19,6 @@ package org.apache.sling.testing.serversetup;
import java.util.Properties;
import org.apache.sling.testing.serversetup.jarexec.JarExecutor;
-import org.apache.sling.testing.serversetup.jarexec.JarExecutor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/src/main/java/org/apache/sling/testing/serversetup/instance/SlingInstanceManager.java b/src/main/java/org/apache/sling/testing/serversetup/instance/SlingInstanceManager.java
index fda6b9f..419fc01 100644
--- a/src/main/java/org/apache/sling/testing/serversetup/instance/SlingInstanceManager.java
+++ b/src/main/java/org/apache/sling/testing/serversetup/instance/SlingInstanceManager.java
@@ -27,7 +27,6 @@ import java.util.concurrent.ConcurrentHashMap;
* Helper class for running tests against multiple Sling instances,
* takes care of starting the Sling instances and waiting for them to be ready.
*/
-@SuppressWarnings("ALL")
public class SlingInstanceManager implements Iterable<SlingInstance > {
private final Map<String, SlingInstance> slingTestInstances = new ConcurrentHashMap<String, SlingInstance>();
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 3415841..e70c9bc 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
@@ -16,6 +16,17 @@
*/
package org.apache.sling.testing.serversetup.instance;
+import static org.junit.Assert.fail;
+
+import java.io.File;
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Properties;
+import java.util.TreeSet;
+
import org.apache.sling.testing.clients.ClientException;
import org.apache.sling.testing.clients.SlingClient;
import org.apache.sling.testing.clients.osgi.BundlesInstaller;
@@ -26,16 +37,9 @@ import org.junit.After;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.io.File;
-import java.net.URI;
-import java.util.*;
-
-import static org.junit.Assert.fail;
-
/** Base class for running tests against a Sling instance,
* takes care of starting Sling and waiting for it to be ready.
*/
-@SuppressWarnings("ALL")
public class SlingTestBase implements SlingInstance {
// TODO: unify these
public static final String TEST_SERVER_URL_PROP = "test.server.url";
@@ -181,12 +185,12 @@ public class SlingTestBase implements SlingInstance {
bundlesInstaller.installBundles(toInstall, false);
final List<String> symbolicNames = new LinkedList<String>();
for (File f : toInstall) {
- symbolicNames.add(osgiConsoleClient.getBundleSymbolicName(f));
+ symbolicNames.add(OsgiConsoleClient.getBundleSymbolicName(f));
}
bundlesInstaller.waitForBundlesInstalled(symbolicNames,
- TimeoutsProvider.getInstance().getTimeout(BUNDLE_INSTALL_TIMEOUT_SECONDS, 10));
+ TimeoutsProvider.getInstance().getTimeout(BUNDLE_INSTALL_TIMEOUT_SECONDS, 10) * 1000);
bundlesInstaller.startAllBundles(symbolicNames,
- TimeoutsProvider.getInstance().getTimeout(START_BUNDLES_TIMEOUT_SECONDS, 30));
+ TimeoutsProvider.getInstance().getTimeout(START_BUNDLES_TIMEOUT_SECONDS, 30) * 1000);
} catch(AssertionError ae) {
log.info("Exception while installing additional bundles", ae);
slingTestState.setInstallBundlesFailed(true);
diff --git a/src/main/java/org/apache/sling/testing/serversetup/jarexec/JarExecutor.java b/src/main/java/org/apache/sling/testing/serversetup/jarexec/JarExecutor.java
index c8f33fb..401f0be 100644
--- a/src/main/java/org/apache/sling/testing/serversetup/jarexec/JarExecutor.java
+++ b/src/main/java/org/apache/sling/testing/serversetup/jarexec/JarExecutor.java
@@ -34,7 +34,6 @@ import org.slf4j.LoggerFactory;
/** Start a runnable jar by forking a JVM process,
* and terminate the process when this VM exits.
*/
-@SuppressWarnings("ALL")
public class JarExecutor {
private final File jarToExecute;
private final String jvmFullPath;