svn commit: r1701292 - in /lucene/dev/branches/branch_5x: ./ solr/ solr/core/ solr/core/src/test/org/apache/solr/search/TestSearcherReuse.java

[yo...@apache.org]

Author: yonik
Date: Fri Sep  4 16:45:06 2015
New Revision: 1701292

URL: http://svn.apache.org/r1701292
Log:
SOLR-8007: tests: fix TestSearcherReuse by avoiding background merges

Modified:
    lucene/dev/branches/branch_5x/   (props changed)
    lucene/dev/branches/branch_5x/solr/   (props changed)
    lucene/dev/branches/branch_5x/solr/core/   (props changed)
    lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/search/TestSearcherReuse.java

Modified: lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/search/TestSearcherReuse.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/search/TestSearcherReuse.java?rev=1701292&r1=1701291&r2=1701292&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/search/TestSearcherReuse.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/search/TestSearcherReuse.java Fri Sep  4 16:45:06 2015
@@ -89,7 +89,10 @@ public class TestSearcherReuse extends S
         assertU(commit());
       }
     }
-    assertU(commit());
+
+    // with random merge policies, a regular commit can cause a segment to be flushed that can kick off a background merge
+    // that can cause a later commit to actually see changes and open a new searcher.  This should not be possible with optimize
+    assertU(optimize());
 
     // seed a single query into the cache
     assertQ(req("*:*"), "//*[@numFound='"+numDocs+"']");