HADOOP-15454. TestRollingFileSystemSinkWithLocal fails on Windows. Contributed by Xiao Liang.
(cherry picked from commit 1da8d4190d6e574347ab9d3380513e9401569573) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/f4f29128 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/f4f29128 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/f4f29128 Branch: refs/heads/branch-3.1 Commit: f4f2912820a79c7b4a336b0b3ed2a7a59f927e7a Parents: ad4d415 Author: Inigo Goiri <[email protected]> Authored: Thu May 10 09:41:16 2018 -0700 Committer: Inigo Goiri <[email protected]> Committed: Thu May 10 09:41:42 2018 -0700 ---------------------------------------------------------------------- .../sink/TestRollingFileSystemSinkWithLocal.java | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/f4f29128/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/metrics2/sink/TestRollingFileSystemSinkWithLocal.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/metrics2/sink/TestRollingFileSystemSinkWithLocal.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/metrics2/sink/TestRollingFileSystemSinkWithLocal.java index 96306bf..1a69c8d 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/metrics2/sink/TestRollingFileSystemSinkWithLocal.java +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/metrics2/sink/TestRollingFileSystemSinkWithLocal.java @@ -18,6 +18,7 @@ package org.apache.hadoop.metrics2.sink; +import org.apache.hadoop.fs.FileUtil; import org.apache.hadoop.metrics2.MetricsSystem; import org.junit.Test; @@ -36,7 +37,7 @@ public class TestRollingFileSystemSinkWithLocal */ @Test public void testWrite() throws Exception { - String path = methodDir.getAbsolutePath(); + String path = methodDir.toURI().toString(); MetricsSystem ms = initMetricsSystem(path, false, false); assertMetricsContents(doWriteTest(ms, path, 1)); @@ -49,7 +50,7 @@ public class TestRollingFileSystemSinkWithLocal */ @Test public void testSilentWrite() throws Exception { - String path = methodDir.getAbsolutePath(); + String path = methodDir.toURI().toString(); MetricsSystem ms = initMetricsSystem(path, true, false); assertMetricsContents(doWriteTest(ms, path, 1)); @@ -62,7 +63,7 @@ public class TestRollingFileSystemSinkWithLocal */ @Test public void testExistingWrite() throws Exception { - String path = methodDir.getAbsolutePath(); + String path = methodDir.toURI().toString(); assertMetricsContents(doAppendTest(path, false, false, 2)); } @@ -75,7 +76,7 @@ public class TestRollingFileSystemSinkWithLocal */ @Test public void testExistingWrite2() throws Exception { - String path = methodDir.getAbsolutePath(); + String path = methodDir.toURI().toString(); MetricsSystem ms = initMetricsSystem(path, false, false); preCreateLogFile(path, 2); @@ -91,7 +92,7 @@ public class TestRollingFileSystemSinkWithLocal */ @Test public void testSilentExistingWrite() throws Exception { - String path = methodDir.getAbsolutePath(); + String path = methodDir.toURI().toString(); assertMetricsContents(doAppendTest(path, false, false, 2)); } @@ -101,12 +102,12 @@ public class TestRollingFileSystemSinkWithLocal */ @Test public void testFailedWrite() { - String path = methodDir.getAbsolutePath(); + String path = methodDir.toURI().toString(); MetricsSystem ms = initMetricsSystem(path, false, false); new MyMetrics1().registerWith(ms); - methodDir.setWritable(false); + assertTrue(FileUtil.setWritable(methodDir, false)); MockSink.errored = false; try { @@ -130,12 +131,12 @@ public class TestRollingFileSystemSinkWithLocal */ @Test public void testSilentFailedWrite() { - String path = methodDir.getAbsolutePath(); + String path = methodDir.toURI().toString(); MetricsSystem ms = initMetricsSystem(path, true, false); new MyMetrics1().registerWith(ms); - methodDir.setWritable(false); + assertTrue(FileUtil.setWritable(methodDir, false)); MockSink.errored = false; try { --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
