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/02/27 19:08:00 UTC
svn commit: r1662773 - in /lucene/dev/branches/lucene_solr_4_10/lucene:
core/src/test/org/apache/lucene/index/TestIndexWriter.java
test-framework/src/java/org/apache/lucene/store/MockDirectoryWrapper.java
Author: mikemccand
Date: Fri Feb 27 18:08:00 2015
New Revision: 1662773
URL: http://svn.apache.org/r1662773
Log:
backport test fix
Modified:
lucene/dev/branches/lucene_solr_4_10/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java
lucene/dev/branches/lucene_solr_4_10/lucene/test-framework/src/java/org/apache/lucene/store/MockDirectoryWrapper.java
Modified: lucene/dev/branches/lucene_solr_4_10/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_10/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java?rev=1662773&r1=1662772&r2=1662773&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_10/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java (original)
+++ lucene/dev/branches/lucene_solr_4_10/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java Fri Feb 27 18:08:00 2015
@@ -2477,7 +2477,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) {
@@ -2517,6 +2520,19 @@ public class TestIndexWriter extends Luc
if (mode != 0) {
dir.setCheckIndexOnClose(false);
}
+
+ if (dir instanceof MockDirectoryWrapper) {
+ MockDirectoryWrapper mdw = (MockDirectoryWrapper) dir;
+ String[] files = dir.listAll();
+ Arrays.sort(files);
+ if ((Arrays.equals(new String[] {"segments_0"}, files) ||
+ Arrays.equals(new String[] {"segments_0", "write.lock"}, files)) &&
+ mdw.didTryToDelete("segments_0")) {
+ // This means virus checker blocked IW deleting the corrupt first commit
+ dir.setCheckIndexOnClose(false);
+ }
+ }
+
dir.close();
}
}
Modified: lucene/dev/branches/lucene_solr_4_10/lucene/test-framework/src/java/org/apache/lucene/store/MockDirectoryWrapper.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_10/lucene/test-framework/src/java/org/apache/lucene/store/MockDirectoryWrapper.java?rev=1662773&r1=1662772&r2=1662773&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_10/lucene/test-framework/src/java/org/apache/lucene/store/MockDirectoryWrapper.java (original)
+++ lucene/dev/branches/lucene_solr_4_10/lucene/test-framework/src/java/org/apache/lucene/store/MockDirectoryWrapper.java Fri Feb 27 18:08:00 2015
@@ -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);
}