Repository: hadoop Updated Branches: refs/heads/branch-2 2285afb32 -> 30d9a5db2 refs/heads/branch-2.9 43340e8eb -> 13e8824dd refs/heads/branch-3.0 7985c5fdc -> a97fe585b refs/heads/branch-3.1 a4f0dbcb4 -> 7eb0bdbd3 refs/heads/trunk 3fc3fa971 -> e65ff1c8b
HDFS-13296. GenericTestUtils generates paths with drive letter in Windows and fail webhdfs related test cases. Contributed by Xiao Liang. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/e65ff1c8 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/e65ff1c8 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/e65ff1c8 Branch: refs/heads/trunk Commit: e65ff1c8be48ef4f04ed96f96ac4caef4974944d Parents: 3fc3fa9 Author: Inigo Goiri <[email protected]> Authored: Mon Mar 19 17:19:30 2018 -0700 Committer: Inigo Goiri <[email protected]> Committed: Mon Mar 19 17:19:30 2018 -0700 ---------------------------------------------------------------------- .../test/java/org/apache/hadoop/test/GenericTestUtils.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/e65ff1c8/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/GenericTestUtils.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/GenericTestUtils.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/GenericTestUtils.java index 61b0271..53eb2be 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/GenericTestUtils.java +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/GenericTestUtils.java @@ -44,6 +44,7 @@ import org.apache.commons.lang.RandomStringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.impl.Log4JLogger; import org.apache.hadoop.fs.FileUtil; +import org.apache.hadoop.fs.Path; import org.apache.hadoop.util.StringUtils; import org.apache.hadoop.util.Time; import org.apache.log4j.Appender; @@ -248,7 +249,7 @@ public abstract class GenericTestUtils { * @return the absolute directory for tests. Caller is expected to create it. */ public static File getRandomizedTestDir() { - return new File(getRandomizedTempPath()).getAbsoluteFile(); + return new File(getRandomizedTempPath()); } /** @@ -259,7 +260,9 @@ public abstract class GenericTestUtils { * @return a string to use in paths */ public static String getTempPath(String subpath) { - String prop = System.getProperty(SYSPROP_TEST_DATA_DIR, DEFAULT_TEST_DATA_PATH); + String prop = (Path.WINDOWS) ? DEFAULT_TEST_DATA_PATH + : System.getProperty(SYSPROP_TEST_DATA_DIR, DEFAULT_TEST_DATA_PATH); + if (prop.isEmpty()) { // corner case: property is there but empty prop = DEFAULT_TEST_DATA_PATH; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
