svn commit: r1653595 - /lucene/dev/branches/lucene_solr_4_10/lucene/test-framework/src/java/org/apache/lucene/index/BaseIndexFileFormatTestCase.java

[mi...@apache.org]

Author: mikemccand
Date: Wed Jan 21 16:52:01 2015
New Revision: 1653595

URL: http://svn.apache.org/r1653595
Log:
backport test fix from 5.x

Modified:
    lucene/dev/branches/lucene_solr_4_10/lucene/test-framework/src/java/org/apache/lucene/index/BaseIndexFileFormatTestCase.java

Modified: lucene/dev/branches/lucene_solr_4_10/lucene/test-framework/src/java/org/apache/lucene/index/BaseIndexFileFormatTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_10/lucene/test-framework/src/java/org/apache/lucene/index/BaseIndexFileFormatTestCase.java?rev=1653595&r1=1653594&r2=1653595&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_10/lucene/test-framework/src/java/org/apache/lucene/index/BaseIndexFileFormatTestCase.java (original)
+++ lucene/dev/branches/lucene_solr_4_10/lucene/test-framework/src/java/org/apache/lucene/index/BaseIndexFileFormatTestCase.java Wed Jan 21 16:52:01 2015
@@ -36,6 +36,7 @@ import org.apache.lucene.codecs.sep.IntI
 import org.apache.lucene.document.Document;
 import org.apache.lucene.store.Directory;
 import org.apache.lucene.store.IndexInput;
+import org.apache.lucene.store.MockDirectoryWrapper;
 import org.apache.lucene.util.CloseableThreadLocal;
 import org.apache.lucene.util.DoubleBarrelLRUCache;
 import org.apache.lucene.util.InfoStream;
@@ -172,6 +173,11 @@ abstract class BaseIndexFileFormatTestCa
   /** The purpose of this test is to make sure that bulk merge doesn't accumulate useless data over runs. */
   public void testMergeStability() throws Exception {
     Directory dir = newDirectory();
+    if (dir instanceof MockDirectoryWrapper) {
+      // Else, the virus checker may prevent deletion of files and cause
+      // us to see too many bytes used by extension in the end:
+      ((MockDirectoryWrapper) dir).setEnableVirusScanner(false);
+    }
     // do not use newMergePolicy that might return a MockMergePolicy that ignores the no-CFS ratio
     // do not use RIW which will change things up!
     MergePolicy mp = newTieredMergePolicy();