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 at...@apache.org on 2012/09/06 01:17:28 UTC
svn commit: r1381438 - in
/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common:
CHANGES.txt
src/test/java/org/apache/hadoop/fs/FileContextMainOperationsBaseTest.java
Author: atm
Date: Wed Sep 5 23:17:27 2012
New Revision: 1381438
URL: http://svn.apache.org/viewvc?rev=1381438&view=rev
Log:
HADOOP-8766. FileContextMainOperationsBaseTest should randomize the root dir. Contributed by Colin Patrick McCabe.
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FileContextMainOperationsBaseTest.java
Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1381438&r1=1381437&r2=1381438&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt Wed Sep 5 23:17:27 2012
@@ -257,6 +257,9 @@ Release 2.0.1-alpha - UNRELEASED
HADOOP-8648. libhadoop: native CRC32 validation crashes when
io.bytes.per.checksum=1. (Colin Patrick McCabe via eli)
+ HADOOP-8766. FileContextMainOperationsBaseTest should randomize the root
+ dir. (Colin Patrick McCabe via atm)
+
BREAKDOWN OF HDFS-3042 SUBTASKS
HADOOP-8220. ZKFailoverController doesn't handle failure to become active
Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FileContextMainOperationsBaseTest.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FileContextMainOperationsBaseTest.java?rev=1381438&r1=1381437&r2=1381438&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FileContextMainOperationsBaseTest.java (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FileContextMainOperationsBaseTest.java Wed Sep 5 23:17:27 2012
@@ -18,6 +18,7 @@
package org.apache.hadoop.fs;
+import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.util.EnumSet;
@@ -61,8 +62,15 @@ public abstract class FileContextMainOpe
private static String TEST_DIR_AXX = "test/hadoop/axx";
private static int numBlocks = 2;
- static final String LOCAL_FS_ROOT_URI = "file:///tmp/test";
-
+ public static final Path LOCAL_FS_ROOT_PATH;
+
+ static {
+ File testBuildData = new File(System.getProperty("test.build.data",
+ "build/test/data"));
+ Path localFsRootPath = new Path(testBuildData.getAbsolutePath(),
+ "root-uri");
+ LOCAL_FS_ROOT_PATH = localFsRootPath.makeQualified(LocalFileSystem.NAME, null);
+ }
protected static FileContext fc;
@@ -95,7 +103,7 @@ public abstract class FileContextMainOpe
@After
public void tearDown() throws Exception {
fc.delete(new Path(getAbsoluteTestRootPath(fc), new Path("test")), true);
- fc.delete(new Path(LOCAL_FS_ROOT_URI), true);
+ fc.delete(LOCAL_FS_ROOT_PATH, true);
}
@@ -176,7 +184,7 @@ public abstract class FileContextMainOpe
// Try a URI
- absoluteDir = new Path(LOCAL_FS_ROOT_URI + "/existingDir");
+ absoluteDir = new Path(LOCAL_FS_ROOT_PATH, "existingDir");
fc.mkdir(absoluteDir, FileContext.DEFAULT_PERM, true);
fc.setWorkingDirectory(absoluteDir);
Assert.assertEquals(absoluteDir, fc.getWorkingDirectory());