big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HDFS-4603. TestMiniDFSCluster fails on Windows. Contributed by Ivan Mitic.

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1457057 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Suresh Srinivas 2013-03-15 18:41:18 +00:00
parent 2ba66a54f5
commit 9c7c2f4f27
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
View File

@ -336,6 +336,8 @@ Trunk (Unreleased)
HDFS-4582. TestHostsFiles fails on Windows. (Ivan Mitic via suresh) HDFS-4582. TestHostsFiles fails on Windows. (Ivan Mitic via suresh)
HDFS-4603. TestMiniDFSCluster fails on Windows. (Ivan Mitic via suresh)
Release 2.0.5-beta - UNRELEASED Release 2.0.5-beta - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

9
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestMiniDFSCluster.java
View File

@ -65,7 +65,7 @@ public void tearDown() {
* *
* @throws Throwable on a failure * @throws Throwable on a failure
*/ */
@Test @Test(timeout=100000)
public void testClusterWithoutSystemProperties() throws Throwable { public void testClusterWithoutSystemProperties() throws Throwable {
System.clearProperty(MiniDFSCluster.PROP_TEST_BUILD_DATA); System.clearProperty(MiniDFSCluster.PROP_TEST_BUILD_DATA);
Configuration conf = new HdfsConfiguration(); Configuration conf = new HdfsConfiguration();
@ -74,7 +74,8 @@ public void testClusterWithoutSystemProperties() throws Throwable {
conf.set(MiniDFSCluster.HDFS_MINIDFS_BASEDIR, c1Path); conf.set(MiniDFSCluster.HDFS_MINIDFS_BASEDIR, c1Path);
MiniDFSCluster cluster = new MiniDFSCluster.Builder(conf).build(); MiniDFSCluster cluster = new MiniDFSCluster.Builder(conf).build();
try { try {
assertEquals(c1Path+"/data", cluster.getDataDirectory()); assertEquals(new File(c1Path + "/data"),
new File(cluster.getDataDirectory()));
} finally { } finally {
cluster.shutdown(); cluster.shutdown();
} }
@ -84,7 +85,7 @@ public void testClusterWithoutSystemProperties() throws Throwable {
* Bring up two clusters and assert that they are in different directories. * Bring up two clusters and assert that they are in different directories.
* @throws Throwable on a failure * @throws Throwable on a failure
*/ */
@Test @Test(timeout=100000)
public void testDualClusters() throws Throwable { public void testDualClusters() throws Throwable {
File testDataCluster2 = new File(testDataPath, CLUSTER_2); File testDataCluster2 = new File(testDataPath, CLUSTER_2);
File testDataCluster3 = new File(testDataPath, CLUSTER_3); File testDataCluster3 = new File(testDataPath, CLUSTER_3);
@ -95,7 +96,7 @@ public void testDualClusters() throws Throwable {
MiniDFSCluster cluster3 = null; MiniDFSCluster cluster3 = null;
try { try {
String dataDir2 = cluster2.getDataDirectory(); String dataDir2 = cluster2.getDataDirectory();
assertEquals(c2Path + "/data", dataDir2); assertEquals(new File(c2Path + "/data"), new File(dataDir2));
//change the data dir //change the data dir
conf.set(MiniDFSCluster.HDFS_MINIDFS_BASEDIR, conf.set(MiniDFSCluster.HDFS_MINIDFS_BASEDIR,
testDataCluster3.getAbsolutePath()); testDataCluster3.getAbsolutePath());