svn commit: r1502584 - in /accumulo/trunk/test/src: main/java/org/apache/accumulo/test/CreateRFiles.java test/java/org/apache/accumulo/test/functional/BulkSplitOptimizationIT.java test/java/org/apache/accumulo/test/functional/CompactionIT.java

[ec...@apache.org]

Author: ecn
Date: Fri Jul 12 15:12:11 2013
New Revision: 1502584

URL: http://svn.apache.org/r1502584
Log:
ACCUMULO-1563 committing Jonathan Hsieh's patch to prevent the test from writing to /

Modified:
    accumulo/trunk/test/src/main/java/org/apache/accumulo/test/CreateRFiles.java
    accumulo/trunk/test/src/test/java/org/apache/accumulo/test/functional/BulkSplitOptimizationIT.java
    accumulo/trunk/test/src/test/java/org/apache/accumulo/test/functional/CompactionIT.java

Modified: accumulo/trunk/test/src/main/java/org/apache/accumulo/test/CreateRFiles.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/test/src/main/java/org/apache/accumulo/test/CreateRFiles.java?rev=1502584&r1=1502583&r2=1502584&view=diff
==============================================================================
--- accumulo/trunk/test/src/main/java/org/apache/accumulo/test/CreateRFiles.java (original)
+++ accumulo/trunk/test/src/main/java/org/apache/accumulo/test/CreateRFiles.java Fri Jul 12 15:12:11 2013
@@ -58,7 +58,7 @@ public class CreateRFiles {
     int count = 0;
     while (currEnd <= opts.end && currStart < currEnd) {
       
-      final String tia = String.format("--rfile /%s/mf%05d --timestamp 1 --size 50 --random 56 --rows %d --start %d --user root", opts.outputDirectory, count, currEnd - currStart, currStart);
+      final String tia = String.format("--rfile %s/mf%05d --timestamp 1 --size 50 --random 56 --rows %d --start %d --user root", opts.outputDirectory, count, currEnd - currStart, currStart);
       
       Runnable r = new Runnable() {
         

Modified: accumulo/trunk/test/src/test/java/org/apache/accumulo/test/functional/BulkSplitOptimizationIT.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/test/src/test/java/org/apache/accumulo/test/functional/BulkSplitOptimizationIT.java?rev=1502584&r1=1502583&r2=1502584&view=diff
==============================================================================
--- accumulo/trunk/test/src/test/java/org/apache/accumulo/test/functional/BulkSplitOptimizationIT.java (original)
+++ accumulo/trunk/test/src/test/java/org/apache/accumulo/test/functional/BulkSplitOptimizationIT.java Fri Jul 12 15:12:11 2013
@@ -56,9 +56,9 @@ public class BulkSplitOptimizationIT ext
     c.tableOperations().setProperty(TABLE_NAME, Property.TABLE_SPLIT_THRESHOLD.getKey(), "1G");
     
     FileSystem fs = FileSystem.get(CachedConfiguration.getInstance());
-    FunctionalTestUtils.createRFiles(c, fs, "/tmp/testmf", ROWS, SPLITS, 8);
+    FunctionalTestUtils.createRFiles(c, fs, "tmp/testmf", ROWS, SPLITS, 8);
     
-    FunctionalTestUtils.bulkImport(c, fs, TABLE_NAME, "/tmp/testmf");
+    FunctionalTestUtils.bulkImport(c, fs, TABLE_NAME, "tmp/testmf");
     
     FunctionalTestUtils.checkSplits(c, TABLE_NAME, 0, 0);
     FunctionalTestUtils.checkRFiles(c, TABLE_NAME, 1, 1, 100, 100);

Modified: accumulo/trunk/test/src/test/java/org/apache/accumulo/test/functional/CompactionIT.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/test/src/test/java/org/apache/accumulo/test/functional/CompactionIT.java?rev=1502584&r1=1502583&r2=1502584&view=diff
==============================================================================
--- accumulo/trunk/test/src/test/java/org/apache/accumulo/test/functional/CompactionIT.java (original)
+++ accumulo/trunk/test/src/test/java/org/apache/accumulo/test/functional/CompactionIT.java Fri Jul 12 15:12:11 2013
@@ -60,8 +60,8 @@ public class CompactionIT extends MacTes
     c.tableOperations().create("test_ingest");
     c.tableOperations().setProperty("test_ingest", Property.TABLE_MAJC_RATIO.getKey(), "1.0");
     FileSystem fs = FileSystem.get(CachedConfiguration.getInstance());
-    FunctionalTestUtils.createRFiles(c, fs, "/tmp/testrf", 500000, 59, 4);
-    FunctionalTestUtils.bulkImport(c, fs, "test_ingest", "/tmp/testrf");
+    FunctionalTestUtils.createRFiles(c, fs, "tmp/testrf", 500000, 59, 4);
+    FunctionalTestUtils.bulkImport(c, fs, "test_ingest", "tmp/testrf");
     int beforeCount = countFiles(c);
     
     final AtomicBoolean fail = new AtomicBoolean(false);