HADOOP-15385. Many tests are failing in hadoop-distcp project in branch-2. Contributed by Jason Lowe.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/2b48854c Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/2b48854c Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/2b48854c Branch: refs/heads/YARN-8200 Commit: 2b48854cfd09a048d983c2a4870d9c95573b4fff Parents: af70c69 Author: Junping Du <junping...@apache.org> Authored: Wed Apr 25 10:11:41 2018 +0800 Committer: Junping Du <junping...@apache.org> Committed: Wed Apr 25 10:11:41 2018 +0800 ---------------------------------------------------------------------- .../test/java/org/apache/hadoop/tools/TestDistCpViewFs.java | 8 ++++---- .../test/java/org/apache/hadoop/tools/TestIntegration.java | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/2b48854c/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestDistCpViewFs.java ---------------------------------------------------------------------- diff --git a/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestDistCpViewFs.java b/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestDistCpViewFs.java index 5511e09..cab2754 100644 --- a/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestDistCpViewFs.java +++ b/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestDistCpViewFs.java @@ -60,12 +60,12 @@ public class TestDistCpViewFs { ConfigUtil.addLink(vConf, "/usr", new URI(fswd.toString())); fs = FileSystem.get(FsConstants.VIEWFS_URI, vConf); fs.setWorkingDirectory(new Path("/usr")); - listFile = new Path("target/tmp/listing").makeQualified(fs.getUri(), + root = new Path("target/TestDistCpViewFs").makeQualified(fs.getUri(), + fs.getWorkingDirectory()).toString(); + listFile = new Path(root, "listing").makeQualified(fs.getUri(), fs.getWorkingDirectory()); - target = new Path("target/tmp/target").makeQualified(fs.getUri(), + target = new Path(root, "target").makeQualified(fs.getUri(), fs.getWorkingDirectory()); - root = new Path("target/tmp").makeQualified(fs.getUri(), - fs.getWorkingDirectory()).toString(); TestDistCpUtils.delete(fs, root); } catch (IOException e) { LOG.error("Exception encountered ", e); http://git-wip-us.apache.org/repos/asf/hadoop/blob/2b48854c/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestIntegration.java ---------------------------------------------------------------------- diff --git a/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestIntegration.java b/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestIntegration.java index ee8e7cc..f15d0d4 100644 --- a/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestIntegration.java +++ b/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestIntegration.java @@ -74,12 +74,12 @@ public class TestIntegration { public static void setup() { try { fs = FileSystem.get(getConf()); - listFile = new Path("target/tmp/listing").makeQualified(fs.getUri(), + root = new Path("target/TestIntegration").makeQualified(fs.getUri(), + fs.getWorkingDirectory()).toString(); + listFile = new Path(root, "listing").makeQualified(fs.getUri(), fs.getWorkingDirectory()); - target = new Path("target/tmp/target").makeQualified(fs.getUri(), + target = new Path(root, "target").makeQualified(fs.getUri(), fs.getWorkingDirectory()); - root = new Path("target/tmp").makeQualified(fs.getUri(), - fs.getWorkingDirectory()).toString(); TestDistCpUtils.delete(fs, root); } catch (IOException e) { LOG.error("Exception encountered ", e); --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
