lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From markrmil...@apache.org
Subject svn commit: r1582575 - in /lucene/dev/branches/solr5914/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop: MorphlineBasicMiniMRTest.java MorphlineGoLiveMiniMRTest.java
Date Fri, 28 Mar 2014 01:20:32 GMT
Author: markrmiller
Date: Fri Mar 28 01:20:31 2014
New Revision: 1582575

URL: http://svn.apache.org/r1582575
Log:
SOLR-5914: Fix map-reduce contrib tests use of solrhome.

Modified:
    lucene/dev/branches/solr5914/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineBasicMiniMRTest.java
    lucene/dev/branches/solr5914/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineGoLiveMiniMRTest.java

Modified: lucene/dev/branches/solr5914/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineBasicMiniMRTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr5914/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineBasicMiniMRTest.java?rev=1582575&r1=1582574&r2=1582575&view=diff
==============================================================================
--- lucene/dev/branches/solr5914/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineBasicMiniMRTest.java
(original)
+++ lucene/dev/branches/solr5914/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineBasicMiniMRTest.java
Fri Mar 28 01:20:31 2014
@@ -79,7 +79,7 @@ public class MorphlineBasicMiniMRTest ex
   
   private static String tempDir;
   
-  private static final File solrHomeDirectory = createTempDir();
+  private static File solrHomeDirectory;
   
   protected MapReduceIndexerTool createTool() {
     return new MapReduceIndexerTool();
@@ -108,7 +108,7 @@ public class MorphlineBasicMiniMRTest ex
 
   @BeforeClass
   public static void setupClass() throws Exception {
-    
+    solrHomeDirectory = createTempDir();
     assumeTrue(
         "Currently this test can only be run without the lucene test security policy in place",
         System.getProperty("java.security.manager", "").equals(""));

Modified: lucene/dev/branches/solr5914/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineGoLiveMiniMRTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr5914/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineGoLiveMiniMRTest.java?rev=1582575&r1=1582574&r2=1582575&view=diff
==============================================================================
--- lucene/dev/branches/solr5914/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineGoLiveMiniMRTest.java
(original)
+++ lucene/dev/branches/solr5914/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineGoLiveMiniMRTest.java
Fri Mar 28 01:20:31 2014
@@ -108,7 +108,7 @@ public class MorphlineGoLiveMiniMRTest e
   private final String inputAvroFile2;
   private final String inputAvroFile3;
 
-  private static final File solrHomeDirectory = createTempDir();
+  private static File solrHomeDirectory;
 
   @Override
   public String getSolrHome() {
@@ -127,6 +127,7 @@ public class MorphlineGoLiveMiniMRTest e
   
   @BeforeClass
   public static void setupClass() throws Exception {
+    solrHomeDirectory = createTempDir();
     assumeTrue(
             "Currently this test can only be run without the lucene test security policy
in place",
             System.getProperty("java.security.manager", "").equals(""));



Mime
View raw message