HDFS-13651. TestReencryptionHandler fails on Windows. Contributed by Anbang Hu.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/e308ac88 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/e308ac88 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/e308ac88 Branch: refs/heads/YARN-1011 Commit: e308ac88d399e9bed3581ff4b1450aa2070dcedf Parents: 3199864 Author: Inigo Goiri <inigo...@apache.org> Authored: Sat Jun 2 20:12:35 2018 -0700 Committer: Inigo Goiri <inigo...@apache.org> Committed: Sat Jun 2 20:12:35 2018 -0700 ---------------------------------------------------------------------- .../hadoop/hdfs/server/namenode/TestReencryptionHandler.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/e308ac88/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestReencryptionHandler.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestReencryptionHandler.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestReencryptionHandler.java index a148edc..d4f79b5 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestReencryptionHandler.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestReencryptionHandler.java @@ -36,6 +36,7 @@ import org.mockito.Mockito; import org.slf4j.LoggerFactory; import org.slf4j.event.Level; +import java.io.File; import java.io.IOException; import java.util.HashMap; import java.util.Map; @@ -67,9 +68,11 @@ public class TestReencryptionHandler { private ReencryptionHandler mockReencryptionhandler(final Configuration conf) throws IOException { // mock stuff to create a mocked ReencryptionHandler + FileSystemTestHelper helper = new FileSystemTestHelper(); + Path targetFile = new Path(new File(helper.getTestRootDir()) + .getAbsolutePath(), "test.jks"); conf.set(CommonConfigurationKeysPublic.HADOOP_SECURITY_KEY_PROVIDER_PATH, - JavaKeyStoreProvider.SCHEME_NAME + "://file" + new Path( - new FileSystemTestHelper().getTestRootDir(), "test.jks").toUri()); + JavaKeyStoreProvider.SCHEME_NAME + "://file" + targetFile.toUri()); final EncryptionZoneManager ezm = Mockito.mock(EncryptionZoneManager.class); final KeyProvider kp = KMSUtil.createKeyProvider(conf, CommonConfigurationKeysPublic.HADOOP_SECURITY_KEY_PROVIDER_PATH); --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
