You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by dk...@apache.org on 2020/11/30 16:07:50 UTC
[sling-org-apache-sling-app-cms] 02/02: Updating to execute the
smoke tests when building the feature model
This is an automated email from the ASF dual-hosted git repository.
dklco pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-app-cms.git
commit df26609d53f99786f99f1768db6317e9f9aea058
Author: Dan Klco <dk...@apache.org>
AuthorDate: Mon Nov 30 11:07:36 2020 -0500
Updating to execute the smoke tests when building the feature model
---
.../src/test/java/org/apache/sling/launchpad/LaunchpadReadyRule.java | 4 ++--
feature/src/test/java/org/apache/sling/launchpad/SmokeIT.java | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/feature/src/test/java/org/apache/sling/launchpad/LaunchpadReadyRule.java b/feature/src/test/java/org/apache/sling/launchpad/LaunchpadReadyRule.java
index d6b6d6f..4686571 100644
--- a/feature/src/test/java/org/apache/sling/launchpad/LaunchpadReadyRule.java
+++ b/feature/src/test/java/org/apache/sling/launchpad/LaunchpadReadyRule.java
@@ -39,7 +39,7 @@ public class LaunchpadReadyRule extends ExternalResource {
public LaunchpadReadyRule(int launchpadPort) {
checks.add(new Check("http://localhost:" + launchpadPort + "/server/default/jcr:root/content"));
- checks.add(new Check("http://localhost:" + launchpadPort + "/content/starter.html") {
+ checks.add(new Check("http://localhost:" + launchpadPort + "/system/sling/form/login") {
@Override
public String runCheck(HttpResponse response) throws Exception {
try (InputStreamReader isr = new InputStreamReader(response.getEntity().getContent());
@@ -47,7 +47,7 @@ public class LaunchpadReadyRule extends ExternalResource {
String line;
while ((line = reader.readLine()) != null) {
- if (line.contains("Do not remove this comment, used for Starter integration tests")) {
+ if (line.contains("Welcome to Apache Sling CMS")) {
return null;
}
}
diff --git a/feature/src/test/java/org/apache/sling/launchpad/SmokeIT.java b/feature/src/test/java/org/apache/sling/launchpad/SmokeIT.java
index 71676dc..9fc6f42 100644
--- a/feature/src/test/java/org/apache/sling/launchpad/SmokeIT.java
+++ b/feature/src/test/java/org/apache/sling/launchpad/SmokeIT.java
@@ -52,8 +52,8 @@ import org.w3c.dom.Node;
public class SmokeIT {
- private static final int LAUNCHPAD_PORT = Integer.getInteger("launchpad.http.port", 8080);
- private static final int EXPECTED_BUNDLES_COUNT = Integer.getInteger("IT.expected.bundles.count", Integer.MAX_VALUE);
+ private static final int LAUNCHPAD_PORT = Integer.getInteger("sling.http.port", 8080);
+ private static final int EXPECTED_BUNDLES_COUNT = Integer.getInteger("IT.expected.bundles.count", 240);
@ClassRule
public static LaunchpadReadyRule LAUNCHPAD = new LaunchpadReadyRule(LAUNCHPAD_PORT);