svn commit: r1670285 - in /lucene/dev/branches/branch_5x: ./ lucene/ lucene/core/ lucene/core/src/test/org/apache/lucene/index/TestConcurrentMergeScheduler.java

[mi...@apache.org]

Author: mikemccand
Date: Tue Mar 31 09:06:39 2015
New Revision: 1670285

URL: http://svn.apache.org/r1670285
Log:
fix test bug: this test was not really testing no wait close

Modified:
    lucene/dev/branches/branch_5x/   (props changed)
    lucene/dev/branches/branch_5x/lucene/   (props changed)
    lucene/dev/branches/branch_5x/lucene/core/   (props changed)
    lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/index/TestConcurrentMergeScheduler.java

Modified: lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/index/TestConcurrentMergeScheduler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/index/TestConcurrentMergeScheduler.java?rev=1670285&r1=1670284&r2=1670285&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/index/TestConcurrentMergeScheduler.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/index/TestConcurrentMergeScheduler.java Tue Mar 31 09:06:39 2015
@@ -217,6 +217,9 @@ public class TestConcurrentMergeSchedule
 
   public void testNoWaitClose() throws IOException {
     Directory directory = newDirectory();
+    if (directory instanceof MockDirectoryWrapper) {
+      ((MockDirectoryWrapper) directory).setPreventDoubleWrite(false);
+    }
     Document doc = new Document();
     Field idField = newStringField("id", "", Field.Store.YES);
     doc.add(idField);
@@ -248,7 +251,6 @@ public class TestConcurrentMergeSchedule
       // stress out aborting them on close:
       ((LogMergePolicy) writer.getConfig().getMergePolicy()).setMergeFactor(3);
       writer.addDocument(doc);
-      writer.commit();
 
       try {
         writer.commit();
@@ -267,7 +269,8 @@ public class TestConcurrentMergeSchedule
               setOpenMode(OpenMode.APPEND).
               setMergePolicy(newLogMergePolicy(100)).
               // Force excessive merging:
-              setMaxBufferedDocs(2)
+              setMaxBufferedDocs(2).
+              setCommitOnClose(false)
       );
     }
     writer.close();