From da777a5498e73f9a44e810dc6771e5c8fe37b6f6 Mon Sep 17 00:00:00 2001 From: Xiaoyu Yao Date: Thu, 15 Mar 2018 09:45:02 -0700 Subject: [PATCH] HDFS-13251. Avoid using hard coded datanode data dirs in unit tests(addendum). Contributed by Ajay Kumar. --- .../datanode/TestDataNodeVolumeFailureToleration.java | 2 +- .../org/apache/hadoop/hdfs/tools/TestDFSAdmin.java | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeVolumeFailureToleration.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeVolumeFailureToleration.java index 9a09570a6d..f83609a08d 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeVolumeFailureToleration.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeVolumeFailureToleration.java @@ -159,7 +159,7 @@ public class TestDataNodeVolumeFailureToleration { long dnCapacity = DFSTestUtil.getDatanodeCapacity(dm, 0); // Fail a volume on the 2nd DN - File dn2Vol1 = cluster.getStorageDir(1, 0); + File dn2Vol1 = cluster.getInstanceStorageDir(1, 0); DataNodeTestUtils.injectDataDirFailure(dn2Vol1); // Should only get two replicas (the first DN and the 3rd) diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestDFSAdmin.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestDFSAdmin.java index 34d34b8851..5d0fd38d43 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestDFSAdmin.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestDFSAdmin.java @@ -351,11 +351,11 @@ public class TestDFSAdmin { } File dnDir0 = cluster.getInstanceStorageDir(0, 0); File dnDir1 = cluster.getInstanceStorageDir(0, 1); - assertThat(outs.get(offset + 1), - is(allOf(containsString("From:"), containsString(dnDir0.getName()), - containsString(dnDir1.getName())))); - assertThat(outs.get(offset + 2), is(not( - anyOf(containsString(dnDir0.getName()), + assertThat(outs.get(offset + 1), is(allOf(containsString("From:"), + containsString(dnDir0.getName()), + containsString(dnDir1.getName())))); + assertThat(outs.get(offset + 2), + is(not(anyOf(containsString(dnDir0.getName()), containsString(dnDir1.getName()))))); assertThat(outs.get(offset + 2), is(allOf(containsString("To"), containsString("data_new"))));