Browse Source

HDFS-13537. TestHdfsHelper does not generate jceks path properly for relative path in Windows. Contributed by Xiao Liang.

Inigo Goiri 7 years ago
parent
commit
914b98a713

+ 3 - 1
hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/test/TestHdfsHelper.java

@@ -163,8 +163,10 @@ public class TestHdfsHelper extends TestDirHelper {
       conf.setBoolean(DFSConfigKeys.DFS_NAMENODE_ACLS_ENABLED_KEY, true);
       conf.setBoolean(DFSConfigKeys.DFS_NAMENODE_ACLS_ENABLED_KEY, true);
       conf.setBoolean(DFSConfigKeys.DFS_NAMENODE_XATTRS_ENABLED_KEY, true);
       conf.setBoolean(DFSConfigKeys.DFS_NAMENODE_XATTRS_ENABLED_KEY, true);
       FileSystemTestHelper helper = new FileSystemTestHelper();
       FileSystemTestHelper helper = new FileSystemTestHelper();
+      Path targetFile = new Path(new File(helper.getTestRootDir())
+          .getAbsolutePath(), "test.jks");
       final String jceksPath = JavaKeyStoreProvider.SCHEME_NAME + "://file" +
       final String jceksPath = JavaKeyStoreProvider.SCHEME_NAME + "://file" +
-          new Path(helper.getTestRootDir(), "test.jks").toUri();
+          targetFile.toUri();
       conf.set(CommonConfigurationKeysPublic.HADOOP_SECURITY_KEY_PROVIDER_PATH,
       conf.set(CommonConfigurationKeysPublic.HADOOP_SECURITY_KEY_PROVIDER_PATH,
           jceksPath);
           jceksPath);
       MiniDFSCluster.Builder builder = new MiniDFSCluster.Builder(conf);
       MiniDFSCluster.Builder builder = new MiniDFSCluster.Builder(conf);