svn merge -c 1584763 from trunk for HDFS-6189. Multiple HDFS tests fail on Windows attempting to use a test root path containing a colon.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1584764 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Tsz-wo Sze 2014-04-04 15:51:49 +00:00
parent e97d46029b
commit 0741fef232
11 changed files with 14 additions and 10 deletions

View File

@ -71,6 +71,9 @@ Release 2.4.1 - UNRELEASED
BUG FIXES
HDFS-6189. Multiple HDFS tests fail on Windows attempting to use a test
root path containing a colon. (cnauroth via szetszwo)
Release 2.4.0 - 2014-04-07
INCOMPATIBLE CHANGES

View File

@ -40,7 +40,7 @@ public class TestFcHdfsCreateMkdir extends
@Override
protected FileContextTestHelper createFileContextHelper() {
return new FileContextTestHelper();
return new FileContextTestHelper("/tmp/TestFcHdfsCreateMkdir");
}

View File

@ -36,7 +36,7 @@ import org.junit.BeforeClass;
public class TestFcHdfsPermission extends FileContextPermissionBase {
private static final FileContextTestHelper fileContextTestHelper =
new FileContextTestHelper();
new FileContextTestHelper("/tmp/TestFcHdfsPermission");
private static FileContext fc;
private static MiniDFSCluster cluster;

View File

@ -43,7 +43,7 @@ import org.junit.Test;
public class TestFcHdfsSetUMask {
private static final FileContextTestHelper fileContextTestHelper =
new FileContextTestHelper();
new FileContextTestHelper("/tmp/TestFcHdfsSetUMask");
private static MiniDFSCluster cluster;
private static Path defaultWorkingDirectory;
private static FileContext fc;

View File

@ -49,7 +49,7 @@ public class TestHDFSFileContextMainOperations extends
@Override
protected FileContextTestHelper createFileContextHelper() {
return new FileContextTestHelper();
return new FileContextTestHelper("/tmp/TestHDFSFileContextMainOperations");
}
@BeforeClass

View File

@ -42,7 +42,8 @@ public class TestSymlinkHdfsDisable {
DistributedFileSystem dfs = cluster.getFileSystem();
FileContext fc = FileContext.getFileContext(cluster.getURI(0), conf);
// Create test files/links
FileContextTestHelper helper = new FileContextTestHelper();
FileContextTestHelper helper = new FileContextTestHelper(
"/tmp/TestSymlinkHdfsDisable");
Path root = helper.getTestRootPath(fc);
Path target = new Path(root, "target");
Path link = new Path(root, "link");

View File

@ -45,7 +45,7 @@ public class TestViewFileSystemAtHdfsRoot extends ViewFileSystemBaseTest {
@Override
protected FileSystemTestHelper createFileSystemHelper() {
return new FileSystemTestHelper();
return new FileSystemTestHelper("/tmp/TestViewFileSystemAtHdfsRoot");
}
@BeforeClass

View File

@ -52,7 +52,7 @@ public class TestViewFileSystemHdfs extends ViewFileSystemBaseTest {
@Override
protected FileSystemTestHelper createFileSystemHelper() {
return new FileSystemTestHelper();
return new FileSystemTestHelper("/tmp/TestViewFileSystemHdfs");
}
@BeforeClass

View File

@ -46,7 +46,7 @@ public class TestViewFsAtHdfsRoot extends ViewFsBaseTest {
@Override
protected FileContextTestHelper createFileContextHelper() {
return new FileContextTestHelper();
return new FileContextTestHelper("/tmp/TestViewFsAtHdfsRoot");
}
@BeforeClass

View File

@ -42,7 +42,7 @@ public class TestViewFsHdfs extends ViewFsBaseTest {
@Override
protected FileContextTestHelper createFileContextHelper() {
return new FileContextTestHelper();
return new FileContextTestHelper("/tmp/TestViewFsHdfs");
}

View File

@ -52,7 +52,7 @@ public class TestFSMainOperationsWebHdfs extends FSMainOperationsBaseTest {
private static FileSystem fileSystem;
public TestFSMainOperationsWebHdfs() {
super();
super("/tmp/TestFSMainOperationsWebHdfs");
}
@Override