Author: rombert
Date: Tue Oct 28 16:13:24 2014
New Revision: 1634905

URL: http://svn.apache.org/r1634905
Log:
SLING-3781 - Fix unstable Eclipse-based tests

Tweak ContentImportTest.importFilesAndFoldersRespectsVltFilters so that
events generated by the initial publish are ignored when looking for
unexpected publishing operations.

Modified:
    
sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/ContentImportTest.java

Modified: 
sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/ContentImportTest.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/ContentImportTest.java?rev=1634905&r1=1634904&r2=1634905&view=diff
==============================================================================
--- 
sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/ContentImportTest.java
 (original)
+++ 
sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/ContentImportTest.java
 Tue Oct 28 16:13:24 2014
@@ -131,14 +131,14 @@ public class ContentImportTest {
         ServerAdapter server = new ServerAdapter(wstServer.getServer());
         server.installModule(contentProject);
 
-        deh.clearUnexpectedEventsAfterSettling();
-
         // create server-side content
         RepositoryAccessor repo = new RepositoryAccessor(config);
         repo.createNode("/content/test-root/de", "nt:folder");
         repo.createNode("/content/test-root/de/files", "nt:folder");
         repo.createFile("/content/test-root/de/files/first.txt", "first 
file".getBytes());
 
+        deh.clearUnexpectedEventsAfterSettling();
+
         runImport(contentProject);
 
         assertThat(contentProject.findMember("jcr_root/content/test-root/de"), 
nullValue());


Reply via email to