svn commit: r1538438 - in /mahout/trunk: core/src/test/java/org/apache/mahout/cf/taste/hadoop/als/ integration/src/test/java/org/apache/mahout/text/

[sslavic]

Author: sslavic
Date: Sun Nov  3 20:10:51 2013
New Revision: 1538438

URL: http://svn.apache.org/r1538438
Log:
MAHOUT-1325 Change remaining hadoop dependent tests to work out of a directory 
that is not under /tmp (isabel via sslavic)

Modified:
    
mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/hadoop/als/ParallelALSFactorizationJobTest.java
    
mahout/trunk/integration/src/test/java/org/apache/mahout/text/SequenceFilesFromMailArchivesTest.java
    
mahout/trunk/integration/src/test/java/org/apache/mahout/text/TestSequenceFilesFromDirectory.java

Modified: 
mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/hadoop/als/ParallelALSFactorizationJobTest.java
URL: 
http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/hadoop/als/ParallelALSFactorizationJobTest.java?rev=1538438&r1=1538437&r2=1538438&view=diff
==============================================================================
--- 
mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/hadoop/als/ParallelALSFactorizationJobTest.java
 (original)
+++ 
mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/hadoop/als/ParallelALSFactorizationJobTest.java
 Sun Nov  3 20:10:51 2013
@@ -19,6 +19,7 @@ package org.apache.mahout.cf.taste.hadoo
 
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.util.ToolRunner;
 import org.apache.mahout.cf.taste.hadoop.TasteHadoopUtils;
 import org.apache.mahout.cf.taste.impl.TasteTestCase;
 import org.apache.mahout.cf.taste.impl.common.FullRunningAverage;
@@ -339,7 +340,10 @@ public class ParallelALSFactorizationJob
     int numIterations = 5;
     double lambda = 0.065;
 
-    int success = alsFactorization.run(new String[] {
+    Configuration conf = getConfiguration();
+
+    int success = ToolRunner.run(alsFactorization, new String[] {
+        "-Dhadoop.tmp.dir=" + conf.get("hadoop.tmp.dir"),
         "--input", inputFile.getAbsolutePath(),
         "--output", intermediateDir.getAbsolutePath(),
         "--tempDir", tmpDir.getAbsolutePath(),
@@ -356,7 +360,8 @@ public class ParallelALSFactorizationJob
 
     RecommenderJob recommender = new RecommenderJob();
 
-    success = recommender.run(new String[] {
+    success = ToolRunner.run(recommender, new String[] {
+        "-Dhadoop.tmp.dir=" + conf.get("hadoop.tmp.dir"),
         "--input", intermediateDir.getAbsolutePath() + "/userRatings/",
         "--userFeatures", intermediateDir.getAbsolutePath() + "/U/",
         "--itemFeatures", intermediateDir.getAbsolutePath() + "/M/",

Modified: 
mahout/trunk/integration/src/test/java/org/apache/mahout/text/SequenceFilesFromMailArchivesTest.java
URL: 
http://svn.apache.org/viewvc/mahout/trunk/integration/src/test/java/org/apache/mahout/text/SequenceFilesFromMailArchivesTest.java?rev=1538438&r1=1538437&r2=1538438&view=diff
==============================================================================
--- 
mahout/trunk/integration/src/test/java/org/apache/mahout/text/SequenceFilesFromMailArchivesTest.java
 (original)
+++ 
mahout/trunk/integration/src/test/java/org/apache/mahout/text/SequenceFilesFromMailArchivesTest.java
 Sun Nov  3 20:10:51 2013
@@ -129,7 +129,7 @@ public final class SequenceFilesFromMail
   @Test
   public void testMapReduce() throws Exception {
 
-    Path tmpDir = this.getTestTempDirPath();
+    Path tmpDir = getTestTempDirPath();
     Path mrOutputDir = new Path(tmpDir, "mail-archives-out-mr");
     Configuration configuration = getConfiguration();
     FileSystem fs = FileSystem.get(configuration);
@@ -137,6 +137,7 @@ public final class SequenceFilesFromMail
     File expectedInputFile = new File(inputDir.toString());
 
     String[] args = {
+      "-Dhadoop.tmp.dir=" + configuration.get("hadoop.tmp.dir"),
       "--input", expectedInputFile.getAbsolutePath(),
       "--output", mrOutputDir.toString(),
       "--charset", "UTF-8",

Modified: 
mahout/trunk/integration/src/test/java/org/apache/mahout/text/TestSequenceFilesFromDirectory.java
URL: 
http://svn.apache.org/viewvc/mahout/trunk/integration/src/test/java/org/apache/mahout/text/TestSequenceFilesFromDirectory.java?rev=1538438&r1=1538437&r2=1538438&view=diff
==============================================================================
--- 
mahout/trunk/integration/src/test/java/org/apache/mahout/text/TestSequenceFilesFromDirectory.java
 (original)
+++ 
mahout/trunk/integration/src/test/java/org/apache/mahout/text/TestSequenceFilesFromDirectory.java
 Sun Nov  3 20:10:51 2013
@@ -126,6 +126,7 @@ public final class TestSequenceFilesFrom
     createFilesFromArrays(conf, inputDir, DATA1);
 
     SequenceFilesFromDirectory.main(new String[]{
+      "-Dhadoop.tmp.dir=" + conf.get("hadoop.tmp.dir"),
       "--input", inputDir.toString(),
       "--output", mrOutputDir.toString(),
       "--chunkSize", "64",
@@ -143,6 +144,7 @@ public final class TestSequenceFilesFrom
     logger.info("\n\n ---- recursive dirs: {}", dirs);
 
     SequenceFilesFromDirectory.main(new String[]{
+      "-Dhadoop.tmp.dir=" + conf.get("hadoop.tmp.dir"),
       "--input", inputDirRecur.toString(),
       "--output", mrOutputDirRecur.toString(),
       "--chunkSize", "64",