You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ct...@apache.org on 2013/07/17 04:33:41 UTC
[39/50] [abbrv] git commit: ACCUMULO-1563 committing Jonathan Hsieh's
patch to prevent the test from writing to /
ACCUMULO-1563 committing Jonathan Hsieh's patch to prevent the test from writing to /
git-svn-id: https://svn.apache.org/repos/asf/accumulo/trunk@1502584 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a904c3a4
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a904c3a4
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a904c3a4
Branch: refs/heads/ACCUMULO-1496
Commit: a904c3a40b9d33b8f9e4320d622ae6c93abddcf5
Parents: e56edc1
Author: Eric C. Newton <ec...@apache.org>
Authored: Fri Jul 12 15:12:11 2013 +0000
Committer: Eric C. Newton <ec...@apache.org>
Committed: Fri Jul 12 15:12:11 2013 +0000
----------------------------------------------------------------------
test/src/main/java/org/apache/accumulo/test/CreateRFiles.java | 2 +-
.../apache/accumulo/test/functional/BulkSplitOptimizationIT.java | 4 ++--
.../java/org/apache/accumulo/test/functional/CompactionIT.java | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a904c3a4/test/src/main/java/org/apache/accumulo/test/CreateRFiles.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/CreateRFiles.java b/test/src/main/java/org/apache/accumulo/test/CreateRFiles.java
index fc50ed9..82f9b6b 100644
--- a/test/src/main/java/org/apache/accumulo/test/CreateRFiles.java
+++ b/test/src/main/java/org/apache/accumulo/test/CreateRFiles.java
@@ -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() {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a904c3a4/test/src/test/java/org/apache/accumulo/test/functional/BulkSplitOptimizationIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/BulkSplitOptimizationIT.java b/test/src/test/java/org/apache/accumulo/test/functional/BulkSplitOptimizationIT.java
index 32e871e..05b9992 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/BulkSplitOptimizationIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/BulkSplitOptimizationIT.java
@@ -56,9 +56,9 @@ public class BulkSplitOptimizationIT extends MacTest {
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);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a904c3a4/test/src/test/java/org/apache/accumulo/test/functional/CompactionIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/CompactionIT.java b/test/src/test/java/org/apache/accumulo/test/functional/CompactionIT.java
index 5b1a83f..5084f37 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/CompactionIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/CompactionIT.java
@@ -60,8 +60,8 @@ public class CompactionIT extends MacTest {
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);