Author: metskem Date: Sun Aug 4 18:36:34 2013 New Revision: 1510299 URL: http://svn.apache.org/r1510299 Log: more JSPWIKI-799, a bit more sensible timings, let's how this runs on the different jenkins nodes...
Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/search/LuceneSearchProvider.java jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/search/SearchManagerTest.java Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/search/LuceneSearchProvider.java URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/search/LuceneSearchProvider.java?rev=1510299&r1=1510298&r2=1510299&view=diff ============================================================================== --- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/search/LuceneSearchProvider.java (original) +++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/search/LuceneSearchProvider.java Sun Aug 4 18:36:34 2013 @@ -191,7 +191,7 @@ public class LuceneSearchProvider implem Date start = new Date(); IndexWriter writer = null; - log.info("Starting Lucene reindexing, this can take a couple minutes..."); + log.info("Starting Lucene reindexing, this can take a couple of minutes..."); Directory luceneDir = new SimpleFSDirectory(dir, null); Modified: jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/search/SearchManagerTest.java URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/search/SearchManagerTest.java?rev=1510299&r1=1510298&r2=1510299&view=diff ============================================================================== --- jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/search/SearchManagerTest.java (original) +++ jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/search/SearchManagerTest.java Sun Aug 4 18:36:34 2013 @@ -34,7 +34,8 @@ import org.apache.wiki.WikiContext; public class SearchManagerTest extends TestCase { - private static final long SLEEP_TIME = 1000L; + private static final long SLEEP_TIME = 2000L; + private static final int SLEEP_COUNT = 50; TestEngine m_engine; SearchManager m_mgr; @@ -72,13 +73,12 @@ public class SearchManagerTest extends T Collection waitForIndex( String text, String testName ) throws Exception { Collection res = null; - int waitCount = 500; - for( long l = 0; l < waitCount; l++ ) + for( long l = 0; l < SLEEP_COUNT; l++ ) { if( res == null || res.isEmpty() ) { Thread.sleep( SLEEP_TIME ); - System.out.println( "SearchManagerTest.waitForIndex for " + testName + " sleeping " + l + " (out of " + waitCount + ")" ); + System.out.println( "SearchManagerTest.waitForIndex for " + testName + " sleeping " + l + " (out of " + SLEEP_COUNT + ")" ); } else {