You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mi...@apache.org on 2015/03/31 11:00:09 UTC
svn commit: r1670278 - in
/lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene:
index/TestConcurrentMergeScheduler.java search/spans/TestSpans.java
Author: mikemccand
Date: Tue Mar 31 09:00:09 2015
New Revision: 1670278
URL: http://svn.apache.org/r1670278
Log:
LUCENE-6308: fix test bug
Modified:
lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/index/TestConcurrentMergeScheduler.java
lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/spans/TestSpans.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=1670278&r1=1670277&r2=1670278&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:00:09 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();
Modified: lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/spans/TestSpans.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/spans/TestSpans.java?rev=1670278&r1=1670277&r2=1670278&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/spans/TestSpans.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/spans/TestSpans.java Tue Mar 31 09:00:09 2015
@@ -376,8 +376,8 @@ public class TestSpans extends LuceneTes
assertEquals("first doc number", spanScorer.docID() + ctx.docBase, 11);
float score = spanScorer.score();
assertTrue("first doc score should be zero, " + score, score == 0.0f);
- } else {
- assertTrue("no second doc", spanScorer.nextDoc() == DocIdSetIterator.NO_MORE_DOCS);
+ } else {
+ assertTrue("no second doc", spanScorer == null || spanScorer.nextDoc() == DocIdSetIterator.NO_MORE_DOCS);
}
}
}