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/10/16 19:16:34 UTC

svn commit: r1709060 - /lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/TestOfflineSorter.java

Author: mikemccand
Date: Fri Oct 16 17:16:33 2015
New Revision: 1709060

URL: http://svn.apache.org/viewvc?rev=1709060&view=rev
Log:
fix test bug: don't use RAMDirectory when sorting 100 MB worth of data

Modified:
    lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/TestOfflineSorter.java

Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/TestOfflineSorter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/TestOfflineSorter.java?rev=1709060&r1=1709059&r2=1709060&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/TestOfflineSorter.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/TestOfflineSorter.java Fri Oct 16 17:16:33 2015
@@ -62,6 +62,14 @@ public class TestOfflineSorter extends L
     return dir;
   }
 
+  private static Directory newFSDirectoryNoVirusScanner() {
+    Directory dir = newFSDirectory(createTempDir());
+    if (dir instanceof MockDirectoryWrapper) {
+      ((MockDirectoryWrapper) dir).setEnableVirusScanner(false);
+    }
+    return dir;
+  }
+
   public void testEmpty() throws Exception {
     try (Directory dir = newDirectoryNoVirusScanner()) {
         checkSort(dir, new OfflineSorter(dir, "foo"), new byte [][] {});
@@ -97,7 +105,7 @@ public class TestOfflineSorter extends L
   @Nightly
   public void testLargerRandom() throws Exception {
     // Sort 100MB worth of data with 15mb buffer.
-    try (Directory dir = newDirectoryNoVirusScanner()) {
+    try (Directory dir = newFSDirectoryNoVirusScanner()) {
       checkSort(dir, new OfflineSorter(dir, "foo", OfflineSorter.DEFAULT_COMPARATOR, BufferSize.megabytes(16), OfflineSorter.MAX_TEMPFILES), 
                 generateRandom((int)OfflineSorter.MB * 100));
     }