From e308ac88d399e9bed3581ff4b1450aa2070dcedf Mon Sep 17 00:00:00 2001 From: Inigo Goiri Date: Sat, 2 Jun 2018 20:12:35 -0700 Subject: [PATCH] HDFS-13651. TestReencryptionHandler fails on Windows. Contributed by Anbang Hu. --- .../hdfs/server/namenode/TestReencryptionHandler.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) 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 a148edc724a..d4f79b56a47 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);