You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ec...@apache.org on 2015/06/17 16:57:03 UTC

accumulo git commit: ACCUMULO-3871 remove some more unnecessary FsShell calls

Repository: accumulo
Updated Branches:
  refs/heads/master b0cb73e1c -> 391cfda10


ACCUMULO-3871 remove some more unnecessary FsShell calls


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/391cfda1
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/391cfda1
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/391cfda1

Branch: refs/heads/master
Commit: 391cfda10a4cd776da06ad59904f217d9f5d1bc8
Parents: b0cb73e
Author: Eric C. Newton <er...@gmail.com>
Authored: Wed Jun 17 10:56:58 2015 -0400
Committer: Eric C. Newton <er...@gmail.com>
Committed: Wed Jun 17 10:56:58 2015 -0400

----------------------------------------------------------------------
 .../main/java/org/apache/accumulo/test/BulkImportVolumeIT.java  | 3 ---
 test/src/main/java/org/apache/accumulo/test/ImportExportIT.java | 5 -----
 2 files changed, 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/391cfda1/test/src/main/java/org/apache/accumulo/test/BulkImportVolumeIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/BulkImportVolumeIT.java b/test/src/main/java/org/apache/accumulo/test/BulkImportVolumeIT.java
index ce60893..e892f6a 100644
--- a/test/src/main/java/org/apache/accumulo/test/BulkImportVolumeIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/BulkImportVolumeIT.java
@@ -27,7 +27,6 @@ import org.apache.accumulo.harness.AccumuloClusterHarness;
 import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FileSystem;
-import org.apache.hadoop.fs.FsShell;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.fs.RawLocalFileSystem;
 import org.junit.Test;
@@ -85,8 +84,6 @@ public class BulkImportVolumeIT extends AccumuloClusterHarness {
     fs.create(bogus).close();
     log.info("bogus: {}", bogus);
     assertTrue(fs.exists(bogus));
-    FsShell fsShell = new FsShell(fs.getConf());
-    assertEquals("Failed to chmod " + rootPath, 0, fsShell.run(new String[] {"-chmod", "-R", "777", rootPath.toString()}));
     log.info("Importing {} into {} with failures directory {}", bulk, tableName, err);
     to.importDirectory(tableName, bulk.toString(), err.toString(), false);
     assertEquals(1, fs.listStatus(err).length);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/391cfda1/test/src/main/java/org/apache/accumulo/test/ImportExportIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/ImportExportIT.java b/test/src/main/java/org/apache/accumulo/test/ImportExportIT.java
index 55d83f5..ddc9404 100644
--- a/test/src/main/java/org/apache/accumulo/test/ImportExportIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/ImportExportIT.java
@@ -16,7 +16,6 @@
  */
 package org.apache.accumulo.test;
 
-import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 import java.io.BufferedReader;
@@ -40,7 +39,6 @@ import org.apache.accumulo.harness.AccumuloClusterHarness;
 import org.apache.hadoop.fs.FSDataInputStream;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.FileUtil;
-import org.apache.hadoop.fs.FsShell;
 import org.apache.hadoop.fs.Path;
 import org.junit.Assert;
 import org.junit.Test;
@@ -103,9 +101,6 @@ public class ImportExportIT extends AccumuloClusterHarness {
       assertTrue("Failed to create " + baseDir, fs.mkdirs(p));
     }
 
-    FsShell fsShell = new FsShell(fs.getConf());
-    assertEquals("Failed to chmod " + baseDir, 0, fsShell.run(new String[] {"-chmod", "-R", "777", baseDir.toString()}));
-
     log.info("Exporting table to {}", exportDir);
     log.info("Importing table from {}", importDir);