You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by el...@apache.org on 2011/06/18 00:53:11 UTC
svn commit: r1137065 - in /hadoop/common/trunk/common: CHANGES.txt
src/test/core/org/apache/hadoop/conf/TestConfiguration.java
Author: eli
Date: Fri Jun 17 22:53:10 2011
New Revision: 1137065
URL: http://svn.apache.org/viewvc?rev=1137065&view=rev
Log:
HADOOP-7402. TestConfiguration doesn't clean up after itself. Contributed by Aaron T. Myers
Modified:
hadoop/common/trunk/common/CHANGES.txt
hadoop/common/trunk/common/src/test/core/org/apache/hadoop/conf/TestConfiguration.java
Modified: hadoop/common/trunk/common/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/common/CHANGES.txt?rev=1137065&r1=1137064&r2=1137065&view=diff
==============================================================================
--- hadoop/common/trunk/common/CHANGES.txt (original)
+++ hadoop/common/trunk/common/CHANGES.txt Fri Jun 17 22:53:10 2011
@@ -321,6 +321,8 @@ Trunk (unreleased changes)
HADOOP-7377. Fix command name handling affecting DFSAdmin. (Daryn Sharp
via mattf)
+ HADOOP-7402. TestConfiguration doesn't clean up after itself. (atm via eli)
+
Release 0.22.0 - Unreleased
INCOMPATIBLE CHANGES
Modified: hadoop/common/trunk/common/src/test/core/org/apache/hadoop/conf/TestConfiguration.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/common/src/test/core/org/apache/hadoop/conf/TestConfiguration.java?rev=1137065&r1=1137064&r2=1137065&view=diff
==============================================================================
--- hadoop/common/trunk/common/src/test/core/org/apache/hadoop/conf/TestConfiguration.java (original)
+++ hadoop/common/trunk/common/src/test/core/org/apache/hadoop/conf/TestConfiguration.java Fri Jun 17 22:53:10 2011
@@ -33,6 +33,7 @@ import java.util.regex.Pattern;
import junit.framework.TestCase;
import static org.junit.Assert.assertArrayEquals;
+import org.apache.commons.lang.StringUtils;
import org.apache.hadoop.fs.Path;
import org.codehaus.jackson.map.ObjectMapper;
@@ -246,7 +247,12 @@ public class TestConfiguration extends T
public void testGetLocalPath() throws IOException {
Configuration conf = new Configuration();
- conf.set("dirs", "a, b, c ");
+ String[] dirs = new String[]{"a", "b", "c"};
+ for (int i = 0; i < dirs.length; i++) {
+ dirs[i] = new Path(System.getProperty("test.build.data"), dirs[i])
+ .toString();
+ }
+ conf.set("dirs", StringUtils.join(dirs, ","));
for (int i = 0; i < 1000; i++) {
String localPath = conf.getLocalPath("dirs", "dir" + i).toString();
assertTrue("Path doesn't end in specified dir: " + localPath,
@@ -258,7 +264,12 @@ public class TestConfiguration extends T
public void testGetFile() throws IOException {
Configuration conf = new Configuration();
- conf.set("dirs", "a, b, c ");
+ String[] dirs = new String[]{"a", "b", "c"};
+ for (int i = 0; i < dirs.length; i++) {
+ dirs[i] = new Path(System.getProperty("test.build.data"), dirs[i])
+ .toString();
+ }
+ conf.set("dirs", StringUtils.join(dirs, ","));
for (int i = 0; i < 1000; i++) {
String localPath = conf.getFile("dirs", "dir" + i).toString();
assertTrue("Path doesn't end in specified dir: " + localPath,