HADOOP-15385. Many tests are failing in hadoop-distcp project in branch-2. Contributed by Jason Lowe.

(cherry picked from commit 2b48854cfd09a048d983c2a4870d9c95573b4fff)

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);

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);