[sling-ide-tooling] branch feature/SLING-7605 updated: SLING-7605 - ContentDeploymentTest sometimes fails on Jenkins

[rombert]

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

rombert pushed a commit to branch feature/SLING-7605
in repository https://gitbox.apache.org/repos/asf/sling-ide-tooling.git


The following commit(s) were added to refs/heads/feature/SLING-7605 by this 
push:
     new 6fea6de  SLING-7605 - ContentDeploymentTest sometimes fails on Jenkins
6fea6de is described below

commit 6fea6de9ec3ae6b9af5681e86ff0651b25e13240
Author: Robert Munteanu <romb...@apache.org>
AuthorDate: Mon Feb 25 18:45:28 2019 +0100

    SLING-7605 - ContentDeploymentTest sometimes fails on Jenkins
    
    Better debugging output from ExternalSlingLaunchpad.
---
 .../sling/ide/test/impl/helpers/ExternalSlingLaunchpad.java      | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git 
a/eclipse/eclipse-test/src/org/apache/sling/ide/test/impl/helpers/ExternalSlingLaunchpad.java
 
b/eclipse/eclipse-test/src/org/apache/sling/ide/test/impl/helpers/ExternalSlingLaunchpad.java
index 11967b9..e6b7d7d 100644
--- 
a/eclipse/eclipse-test/src/org/apache/sling/ide/test/impl/helpers/ExternalSlingLaunchpad.java
+++ 
b/eclipse/eclipse-test/src/org/apache/sling/ide/test/impl/helpers/ExternalSlingLaunchpad.java
@@ -20,6 +20,7 @@ import java.io.InputStreamReader;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.ListIterator;
 import java.util.concurrent.TimeUnit;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -63,20 +64,26 @@ public class ExternalSlingLaunchpad extends 
ExternalResource {
         rules.add(new StartLevelSlingReadyRule(client));
         rules.add(new ActiveBundlesSlingReadyRule(client));
         rules.add(new RepositoryAvailableReadyRule(client));
+        
+        debug("Starting check");
 
         for (SlingReadyRule rule : rules) {
+            debug("Checking " + rule);
             while (true) {
                 if (rule.evaluate()) {
+                    debug("Rule " + rule + " succeeded.");
                     break;
                 }
                 assertTimeout(cutoff);
-
                 Thread.sleep(100);
             }
         }
+        
+        debug("Checks complete");
     }
 
     private void assertTimeout(long cutoff) throws AssertionFailedError {
+        debug("Check for timeout, current " + System.currentTimeMillis() + ", 
cutoff " + cutoff);
         if (System.currentTimeMillis() > cutoff) {
             throw new AssertionFailedError("Sling launchpad did not start 
within " + MAX_WAIT_TIME_MS + " milliseconds");
         }