steveloughran commented on a change in pull request #2097:
URL: https://github.com/apache/hadoop/pull/2097#discussion_r450305929
##########
File path:
hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/conf/TestConfiguration.java
##########
@@ -1062,6 +1062,38 @@ public void testRelativeIncludes() throws Exception {
new File(new File(relConfig).getParent()).delete();
}
+ @Test
+ public void testRelativeIncludesWithLoadingViaUri() throws Exception {
+ tearDown();
+ File configFile = new File("./tmp/test-config.xml");
+ File configFile2 = new File("./tmp/test-config2.xml");
+
+ new File(configFile.getParent()).mkdirs();
+ out = new BufferedWriter(new FileWriter(configFile2));
+ startConfig();
+ appendProperty("a", "b");
+ endConfig();
+
+ out = new BufferedWriter(new FileWriter(configFile));
+ startConfig();
+ // Add the relative path instead of the absolute one.
+ startInclude(configFile2.getName());
+ endInclude();
+ appendProperty("c", "d");
+ endConfig();
+
+ // verify that the includes file contains all properties
+ Path fileResource = new Path(configFile.toURI());
+ conf.addResource(fileResource);
+ assertEquals(conf.get("a"), "b");
Review comment:
exactly. Because Junit reports arg 1 as the 'expected value' in the
exceptions it raises...if they are the wrong way round the error is misleading
and it takes longer to debug.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
