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 2014/08/30 10:42:57 UTC
svn commit: r1621429 - in /lucene/dev/trunk: ./ lucene/ lucene/core/
lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java
lucene/test-framework/
lucene/test-framework/src/java/org/apache/lucene/store/MockDirectoryWrapper.java
Author: mikemccand
Date: Sat Aug 30 08:42:57 2014
New Revision: 1621429
URL: http://svn.apache.org/r1621429
Log:
LUCENE-5904: fix false fail
Modified:
lucene/dev/trunk/ (props changed)
lucene/dev/trunk/lucene/ (props changed)
lucene/dev/trunk/lucene/core/ (props changed)
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java
lucene/dev/trunk/lucene/test-framework/ (props changed)
lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/store/MockDirectoryWrapper.java
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java?rev=1621429&r1=1621428&r2=1621429&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java Sat Aug 30 08:42:57 2014
@@ -2504,7 +2504,10 @@ public class TestIndexWriter extends Luc
public void testCorruptFirstCommit() throws Exception {
for(int i=0;i<6;i++) {
BaseDirectoryWrapper dir = newDirectory();
+
+ // Create a corrupt first commit:
dir.createOutput("segments_0", IOContext.DEFAULT).close();
+
IndexWriterConfig iwc = newIndexWriterConfig(new MockAnalyzer(random()));
int mode = i/2;
if (mode == 0) {
@@ -2544,6 +2547,16 @@ public class TestIndexWriter extends Luc
if (mode != 0) {
dir.setCheckIndexOnClose(false);
}
+
+ if (dir instanceof MockDirectoryWrapper) {
+ MockDirectoryWrapper mdw = (MockDirectoryWrapper) dir;
+ if (Arrays.equals(new String[] {"segments_0"}, dir.listAll()) &&
+ mdw.didTryToDelete("segments_0")) {
+ // This means virus checker blocked IW deleting the corrupt first commit
+ dir.setCheckIndexOnClose(false);
+ }
+ }
+
dir.close();
}
}
Modified: lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/store/MockDirectoryWrapper.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/store/MockDirectoryWrapper.java?rev=1621429&r1=1621428&r2=1621429&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/store/MockDirectoryWrapper.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/store/MockDirectoryWrapper.java Sat Aug 30 08:42:57 2014
@@ -494,6 +494,12 @@ public class MockDirectoryWrapper extend
in.deleteFile(name);
}
+ /** Returns true if {@link #deleteFile} was called with this
+ * fileName, but the virus checker prevented the deletion. */
+ public boolean didTryToDelete(String fileName) {
+ return triedToDelete.contains(fileName);
+ }
+
public synchronized Set<String> getOpenDeletedFiles() {
return new HashSet<>(openFilesDeleted);
}