You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by yo...@apache.org on 2010/08/05 02:28:34 UTC
svn commit: r982443 -
/lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/update/AutoCommitTest.java
Author: yonik
Date: Thu Aug 5 00:28:34 2010
New Revision: 982443
URL: http://svn.apache.org/viewvc?rev=982443&view=rev
Log:
SOLR-2028: fix AutoCommitTest (merge trunk 982442)
Modified:
lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/update/AutoCommitTest.java (contents, props changed)
Modified: lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/update/AutoCommitTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/update/AutoCommitTest.java?rev=982443&r1=982442&r2=982443&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/update/AutoCommitTest.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/update/AutoCommitTest.java Thu Aug 5 00:28:34 2010
@@ -67,8 +67,7 @@ class CommitListener implements SolrEven
// since there could be two commits in a row, don't test for a specific new searcher
// just test that the old one has been replaced.
if (s != currentSearcher) return true;
- Thread.sleep(250);
- break;
+ // it may be that a commit just happened, but the new searcher hasn't been registered yet.
}
Thread.sleep( 250 );
} catch (InterruptedException e) {}
Propchange: lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/update/AutoCommitTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Aug 5 00:28:34 2010
@@ -0,0 +1,6 @@
+/lucene/dev/trunk/solr/src/test/org/apache/solr/update/AutoCommitTest.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,932998-932999,933541-933575,933598,933613,933679,933879,934339,934954,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939611,939649,940433,940447,940451-940452,940556,940666,940699,940730,940878-940892,940994,941270,941363,942166,942235,942288,942676,942719,943142,943493,943931,945057,945090,945130,945245,945343,945420,946139,946330,946338,946599,948011,948082,948429,949288,949311,949445,949976,949997,950008,950042,950125,950207,950458,950613,950723,950835,951126,951355,951397,951521,953628,953886,954336,955547,955613,955615,955796-955797,955809-955996,956097,956125,956173,956316,956715,957465,957520,957634,957707,960367,9603
74,961821,961941,962555,962714,963372,963654,963720,963781,963873,963888,963906,963909,963920,964019,964054,964267,964312,964430,964459,964720,964753,964832,964856,965103,965222,965230,965327,965330,965585,965938,966354,979049,979807,980369,980428,980436,980501,980555,980592,980909,980911,980917,981265,981550,981598,981650,981661,981690,981857,981936,982073,982084,982201,982442
+/lucene/java/branches/lucene_2_4/solr/src/test/org/apache/solr/update/AutoCommitTest.java:748824
+/lucene/java/branches/lucene_2_9/solr/src/test/org/apache/solr/update/AutoCommitTest.java:817269-818600,825998,829134,829881,831036,896850,909334
+/lucene/java/branches/lucene_2_9_back_compat_tests/solr/src/test/org/apache/solr/update/AutoCommitTest.java:818601-821336
+/lucene/java/branches/lucene_3_0/solr/src/test/org/apache/solr/update/AutoCommitTest.java:880793,896906
+/lucene/solr/trunk/src/test/org/apache/solr/update/AutoCommitTest.java:922950-923910,923912-925091