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

[mi...@apache.org]

Author: mikemccand
Date: Fri Feb 27 17:46:43 2015
New Revision: 1662763

URL: http://svn.apache.org/r1662763
Log:
backport test fix to testMergeStability

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=1662763&r1=1662762&r2=1662763&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 Fri Feb 27 17:46:43 2015
@@ -196,6 +196,11 @@ abstract class BaseIndexFileFormatTestCa
     IndexReader reader = DirectoryReader.open(dir);
 
     Directory dir2 = newDirectory();
+    if (dir2 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) dir2).setEnableVirusScanner(false);
+    }
     mp = newTieredMergePolicy();
     mp.setNoCFSRatio(0);
     cfg = new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random())).setUseCompoundFile(false).setMergePolicy(mp);