Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HADOOP-15308. TestConfiguration fails on Windows because of paths. Contributed by Xiao Liang. 

(cherry picked from commit 427fd027a3)
(cherry picked from commit 36451f2d54)
This commit is contained in:
Inigo Goiri 2018-03-13 20:01:07 -07:00
parent 98b086cec5
commit 60feb43b7c
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/conf/TestConfiguration.java
View File

@ -74,8 +74,8 @@ public class TestConfiguration extends TestCase {
final static String CONFIG = new File("./test-config-TestConfiguration.xml").getAbsolutePath(); final static String CONFIG = new File("./test-config-TestConfiguration.xml").getAbsolutePath();
final static String CONFIG2 = new File("./test-config2-TestConfiguration.xml").getAbsolutePath(); final static String CONFIG2 = new File("./test-config2-TestConfiguration.xml").getAbsolutePath();
final static String CONFIG_FOR_ENUM = new File("./test-config-enum-TestConfiguration.xml").getAbsolutePath(); final static String CONFIG_FOR_ENUM = new File("./test-config-enum-TestConfiguration.xml").getAbsolutePath();
final static String CONFIG_FOR_URI = "file://" final static String CONFIG_FOR_URI = new File(
+ new File("./test-config-uri-TestConfiguration.xml").getAbsolutePath(); "./test-config-uri-TestConfiguration.xml").toURI().toString();
private static final String CONFIG_MULTI_BYTE = new File( private static final String CONFIG_MULTI_BYTE = new File(
"./test-config-multi-byte-TestConfiguration.xml").getAbsolutePath(); "./test-config-multi-byte-TestConfiguration.xml").getAbsolutePath();
@ -720,7 +720,8 @@ public class TestConfiguration extends TestCase {
out.close(); out.close();
out=new BufferedWriter(new FileWriter(CONFIG)); out=new BufferedWriter(new FileWriter(CONFIG));
writeHeader(); writeHeader();
declareSystemEntity("configuration", "d", CONFIG2); declareSystemEntity("configuration", "d",
new Path(CONFIG2).toUri().toString());
writeConfiguration(); writeConfiguration();
appendProperty("a", "b"); appendProperty("a", "b");
appendProperty("c", "&d;"); appendProperty("c", "&d;");
@ -1448,7 +1449,7 @@ public class TestConfiguration extends TestCase {
assertEquals("test.key2", jp1.getKey()); assertEquals("test.key2", jp1.getKey());
assertEquals("value2", jp1.getValue()); assertEquals("value2", jp1.getValue());
assertEquals(true, jp1.isFinal); assertEquals(true, jp1.isFinal);
assertEquals(fileResource.toUri().getPath(), jp1.getResource()); assertEquals(fileResource.toString(), jp1.getResource());
// test xml format // test xml format
outWriter = new StringWriter(); outWriter = new StringWriter();
@ -1459,7 +1460,7 @@ public class TestConfiguration extends TestCase {
assertEquals(1, actualConf1.size()); assertEquals(1, actualConf1.size());
assertEquals("value2", actualConf1.get("test.key2")); assertEquals("value2", actualConf1.get("test.key2"));
assertTrue(actualConf1.getFinalParameters().contains("test.key2")); assertTrue(actualConf1.getFinalParameters().contains("test.key2"));
assertEquals(fileResource.toUri().getPath(), assertEquals(fileResource.toString(),
actualConf1.getPropertySources("test.key2")[0]); actualConf1.getPropertySources("test.key2")[0]);
// case 2: dump an non existing property // case 2: dump an non existing property
@ -1914,7 +1915,8 @@ public class TestConfiguration extends TestCase {
final File tmpDir = GenericTestUtils.getRandomizedTestDir(); final File tmpDir = GenericTestUtils.getRandomizedTestDir();
tmpDir.mkdirs(); tmpDir.mkdirs();
final String ourUrl = new URI(LocalJavaKeyStoreProvider.SCHEME_NAME, final String ourUrl = new URI(LocalJavaKeyStoreProvider.SCHEME_NAME,
"file", new File(tmpDir, "test.jks").toString(), null).toString(); "file", new File(tmpDir, "test.jks").toURI().getPath(),
null).toString();
conf = new Configuration(false); conf = new Configuration(false);
conf.set(CredentialProviderFactory.CREDENTIAL_PROVIDER_PATH, ourUrl); conf.set(CredentialProviderFactory.CREDENTIAL_PROVIDER_PATH, ourUrl);
@ -1941,7 +1943,8 @@ public class TestConfiguration extends TestCase {
final File tmpDir = GenericTestUtils.getRandomizedTestDir(); final File tmpDir = GenericTestUtils.getRandomizedTestDir();
tmpDir.mkdirs(); tmpDir.mkdirs();
final String ourUrl = new URI(LocalJavaKeyStoreProvider.SCHEME_NAME, final String ourUrl = new URI(LocalJavaKeyStoreProvider.SCHEME_NAME,
"file", new File(tmpDir, "test.jks").toString(), null).toString(); "file", new File(tmpDir, "test.jks").toURI().getPath(),
null).toString();
conf = new Configuration(false); conf = new Configuration(false);
conf.set(CredentialProviderFactory.CREDENTIAL_PROVIDER_PATH, ourUrl); conf.set(CredentialProviderFactory.CREDENTIAL_PROVIDER_PATH, ourUrl);