You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2019/02/26 17:09:04 UTC

[sling-ide-tooling] branch feature/SLING-8290 updated: SLING-8290 - BundleDeploymentTest failure on Jenkins

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

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


The following commit(s) were added to refs/heads/feature/SLING-8290 by this push:
     new 6b241f7  SLING-8290 - BundleDeploymentTest failure on Jenkins
6b241f7 is described below

commit 6b241f73fde12bc17e1f1408d0824cec0ecb1572
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Tue Feb 26 18:07:30 2019 +0100

    SLING-8290 - BundleDeploymentTest failure on Jenkins
    
    Wait for job execution to settle between java source file changes. This
    removes the possibility of changes overlapping with publication events
    and not including the 'V2' update.
---
 .../src/org/apache/sling/ide/test/impl/BundleDeploymentTest.java    | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/eclipse/eclipse-test/src/org/apache/sling/ide/test/impl/BundleDeploymentTest.java b/eclipse/eclipse-test/src/org/apache/sling/ide/test/impl/BundleDeploymentTest.java
index 6b1927a..b90a388 100644
--- a/eclipse/eclipse-test/src/org/apache/sling/ide/test/impl/BundleDeploymentTest.java
+++ b/eclipse/eclipse-test/src/org/apache/sling/ide/test/impl/BundleDeploymentTest.java
@@ -41,6 +41,7 @@ import org.apache.sling.ide.test.impl.helpers.UninstallBundleRule;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.jdt.core.JavaCore;
 import org.junit.Rule;
 import org.junit.Test;
@@ -136,6 +137,11 @@ public class BundleDeploymentTest {
                 return null;
             }
         }, nullValue(Void.class));
+        
+        // wait until no jobs are executing
+        poller.pollUntilTrue(() -> {
+            return Job.getJobManager().isIdle();
+        });
 
         // update DS component class
         InputStream simpleServlet2 = getClass().getResourceAsStream("SimpleServlet.java.v2.txt");