[sling-org-apache-sling-junit-core] branch master updated: Use a more lightweight Sling instance for testing

[bdelacretaz]

This is an automated email from the ASF dual-hosted git repository.

bdelacretaz pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-junit-core.git


The following commit(s) were added to refs/heads/master by this push:
     new 88d700a  Use a more lightweight Sling instance for testing
88d700a is described below

commit 88d700a6589a0d080a84ac2f3183773d6794dea3
Author: Bertrand Delacretaz <bdelacre...@apache.org>
AuthorDate: Mon Mar 15 18:20:43 2021 +0100

    Use a more lightweight Sling instance for testing
---
 .../org/apache/sling/junit/annotations/AnnotationsTestSupport.java   | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git 
a/src/it/annotations-it/src/test/java/org/apache/sling/junit/annotations/AnnotationsTestSupport.java
 
b/src/it/annotations-it/src/test/java/org/apache/sling/junit/annotations/AnnotationsTestSupport.java
index e762f35..2c77663 100644
--- 
a/src/it/annotations-it/src/test/java/org/apache/sling/junit/annotations/AnnotationsTestSupport.java
+++ 
b/src/it/annotations-it/src/test/java/org/apache/sling/junit/annotations/AnnotationsTestSupport.java
@@ -28,7 +28,7 @@ import org.ops4j.pax.exam.options.extra.VMOption;
 
 import org.apache.sling.junit.it.impl.MyCoolServiceForTestingIT;
 import org.apache.sling.junit.it.impl.MyLameServiceForTestingIT;
-import static 
org.apache.sling.testing.paxexam.SlingOptions.slingQuickstartOakTar;
+import static org.apache.sling.testing.paxexam.SlingOptions.slingServlets;
 import static org.apache.sling.testing.paxexam.SlingOptions.versionResolver;
 import static org.apache.sling.testing.paxexam.SlingOptions.logback;
 import static org.ops4j.pax.exam.CoreOptions.options;
@@ -72,7 +72,7 @@ public class AnnotationsTestSupport extends TestSupport {
             
systemProperty("org.osgi.service.http.port").value(String.valueOf(httpPort)),
 
             serverBaseConfiguration(),
-            slingQuickstartOakTar(workingDirectory(), httpPort),
+            slingServlets(),
 
             testBundle("bundle.filename"),
             
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.junit.core").versionAsInProject(),
@@ -90,7 +90,6 @@ public class AnnotationsTestSupport extends TestSupport {
     public void waitForSling() throws Exception {
         final URI url = new URI(String.format("http://localhost:%d";, 
httpPort));
         CLIENT = new OsgiConsoleClient(url, "admin", "admin");
-        CLIENT.waitExists("/", STARTUP_WAIT_SECONDS * 1000, 500);
 
         final String [] waitFor = {
             MyCoolServiceForTestingIT.class.getName(),