You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2014/08/26 13:43:07 UTC
svn commit: r1620576 - in /lucene/dev/branches/lucene5904/lucene:
core/src/test/org/apache/lucene/index/
test-framework/src/java/org/apache/lucene/store/
Author: rmuir
Date: Tue Aug 26 11:43:07 2014
New Revision: 1620576
URL: http://svn.apache.org/r1620576
Log:
LUCENE-5904: fix false failures
Modified:
lucene/dev/branches/lucene5904/lucene/core/src/test/org/apache/lucene/index/TestAddIndexes.java
lucene/dev/branches/lucene5904/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java
lucene/dev/branches/lucene5904/lucene/core/src/test/org/apache/lucene/index/TestOmitTf.java
lucene/dev/branches/lucene5904/lucene/test-framework/src/java/org/apache/lucene/store/MockDirectoryWrapper.java
Modified: lucene/dev/branches/lucene5904/lucene/core/src/test/org/apache/lucene/index/TestAddIndexes.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/lucene/core/src/test/org/apache/lucene/index/TestAddIndexes.java?rev=1620576&r1=1620575&r2=1620576&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/lucene/core/src/test/org/apache/lucene/index/TestAddIndexes.java (original)
+++ lucene/dev/branches/lucene5904/lucene/core/src/test/org/apache/lucene/index/TestAddIndexes.java Tue Aug 26 11:43:07 2014
@@ -1104,7 +1104,8 @@ public class TestAddIndexes extends Luce
IndexReader[] readers = new IndexReader[] { DirectoryReader.open(dirs[0]), DirectoryReader.open(dirs[1]) };
- Directory dir = new MockDirectoryWrapper(random(), new RAMDirectory());
+ MockDirectoryWrapper dir = new MockDirectoryWrapper(random(), new RAMDirectory());
+ dir.setEnableVirusScanner(false); // we check for specific list of files
IndexWriterConfig conf = new IndexWriterConfig(new MockAnalyzer(random())).setMergePolicy(newLogMergePolicy(true));
MergePolicy lmp = conf.getMergePolicy();
// Force creation of CFS:
Modified: lucene/dev/branches/lucene5904/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java?rev=1620576&r1=1620575&r2=1620576&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java (original)
+++ lucene/dev/branches/lucene5904/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java Tue Aug 26 11:43:07 2014
@@ -939,6 +939,7 @@ public class TestIndexWriterExceptions e
for (FailOnlyInCommit failure : failures) {
MockDirectoryWrapper dir = newMockDirectory();
dir.setFailOnCreateOutput(false);
+ dir.setEnableVirusScanner(false); // we check for specific list of files
IndexWriter w = new IndexWriter(dir, newIndexWriterConfig(new MockAnalyzer(random())));
Document doc = new Document();
doc.add(newTextField("field", "a field", Field.Store.YES));
Modified: lucene/dev/branches/lucene5904/lucene/core/src/test/org/apache/lucene/index/TestOmitTf.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/lucene/core/src/test/org/apache/lucene/index/TestOmitTf.java?rev=1620576&r1=1620575&r2=1620576&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/lucene/core/src/test/org/apache/lucene/index/TestOmitTf.java (original)
+++ lucene/dev/branches/lucene5904/lucene/core/src/test/org/apache/lucene/index/TestOmitTf.java Tue Aug 26 11:43:07 2014
@@ -38,6 +38,7 @@ import org.apache.lucene.search.TermQuer
import org.apache.lucene.search.TermStatistics;
import org.apache.lucene.search.similarities.TFIDFSimilarity;
import org.apache.lucene.store.Directory;
+import org.apache.lucene.store.MockDirectoryWrapper;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.LuceneTestCase;
@@ -219,6 +220,10 @@ public class TestOmitTf extends LuceneTe
// Verifies no *.prx exists when all fields omit term freq:
public void testNoPrxFile() throws Throwable {
Directory ram = newDirectory();
+ if (ram instanceof MockDirectoryWrapper) {
+ // we verify some files get deleted
+ ((MockDirectoryWrapper)ram).setEnableVirusScanner(false);
+ }
Analyzer analyzer = new MockAnalyzer(random());
IndexWriter writer = new IndexWriter(ram, newIndexWriterConfig(analyzer)
.setMaxBufferedDocs(3)
Modified: lucene/dev/branches/lucene5904/lucene/test-framework/src/java/org/apache/lucene/store/MockDirectoryWrapper.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/lucene/test-framework/src/java/org/apache/lucene/store/MockDirectoryWrapper.java?rev=1620576&r1=1620575&r2=1620576&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/lucene/test-framework/src/java/org/apache/lucene/store/MockDirectoryWrapper.java (original)
+++ lucene/dev/branches/lucene5904/lucene/test-framework/src/java/org/apache/lucene/store/MockDirectoryWrapper.java Tue Aug 26 11:43:07 2014
@@ -478,7 +478,7 @@ public class MockDirectoryWrapper extend
openFilesDeleted.remove(name);
}
}
- if (!forced && enableVirusScanner && randomState.nextInt(4) == 0) {
+ if (!forced && enableVirusScanner && (true || randomState.nextInt(4) == 0)) { // nocommit
if (LuceneTestCase.VERBOSE) {
System.out.println("MDW: now refuse to delete file: " + name);
}