You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by bd...@apache.org on 2013/11/01 14:58:01 UTC

svn commit: r1537938 - /sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/ServerSideScriptsTest.java

Author: bdelacretaz
Date: Fri Nov  1 13:58:00 2013
New Revision: 1537938

URL: http://svn.apache.org/r1537938
Log:
SLING-3087 - for now, work around out-of-sync repository Sessions/queries with a time delay

Modified:
    sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/ServerSideScriptsTest.java

Modified: sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/ServerSideScriptsTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/ServerSideScriptsTest.java?rev=1537938&r1=1537937&r2=1537938&view=diff
==============================================================================
--- sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/ServerSideScriptsTest.java (original)
+++ sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/ServerSideScriptsTest.java Fri Nov  1 13:58:00 2013
@@ -225,6 +225,11 @@ public class ServerSideScriptsTest {
             final String destPath = scriptPath + "/test.txt" + test.scriptExtension;
             logger.info("Setting up node {} for {}", destPath, test.testScriptFile.getAbsoluteFile());
             this.slingClient.upload(destPath, new FileInputStream(test.testScriptFile), -1, false);
+            
+            // SLING-3087 with Oak, the Sling JUnit's scriptable module TestAllPaths class
+            // might still see the old script, and not yet the new one, for some time.
+            // There's probably a better way to avoid this...for now just wait a bit
+            Thread.sleep(2000L);
 
             final long startTime = System.currentTimeMillis();
             final ServerSideTestClient.TestResults results = slingClient.runTests("org.apache.sling.junit.scriptable.ScriptableTestsProvider");