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 wa...@apache.org on 2016/06/08 19:59:15 UTC
hadoop git commit: Remove redundant
TestMiniDFSCluster.testDualClusters. Contributed by Jiayi Zhou.
Repository: hadoop
Updated Branches:
refs/heads/branch-2 67dbd4c46 -> 931966546
Remove redundant TestMiniDFSCluster.testDualClusters. Contributed by Jiayi Zhou.
(cherry picked from commit 1ee9ea002609971ad58082bf525d57fca8a37035)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/93196654
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/93196654
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/93196654
Branch: refs/heads/branch-2
Commit: 9319665461201ca84c7fa007c09f087f5753c8cc
Parents: 67dbd4c
Author: Andrew Wang <wa...@apache.org>
Authored: Wed Jun 8 12:58:56 2016 -0700
Committer: Andrew Wang <wa...@apache.org>
Committed: Wed Jun 8 12:58:59 2016 -0700
----------------------------------------------------------------------
.../apache/hadoop/hdfs/TestMiniDFSCluster.java | 31 --------------------
1 file changed, 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/93196654/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestMiniDFSCluster.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestMiniDFSCluster.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestMiniDFSCluster.java
index 78ae8b1..ec72d87 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestMiniDFSCluster.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestMiniDFSCluster.java
@@ -20,7 +20,6 @@ package org.apache.hadoop.hdfs;
import static org.apache.hadoop.hdfs.DFSConfigKeys.DFS_NAMENODE_HTTP_ADDRESS_KEY;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
import static org.junit.Assume.assumeTrue;
import java.io.File;
@@ -84,36 +83,6 @@ public class TestMiniDFSCluster {
}
}
- /**
- * Bring up two clusters and assert that they are in different directories.
- * @throws Throwable on a failure
- */
- @Test(timeout=100000)
- public void testDualClusters() throws Throwable {
- File testDataCluster2 = new File(testDataPath, CLUSTER_2);
- File testDataCluster3 = new File(testDataPath, CLUSTER_3);
- Configuration conf = new HdfsConfiguration();
- String c2Path = testDataCluster2.getAbsolutePath();
- conf.set(MiniDFSCluster.HDFS_MINIDFS_BASEDIR, c2Path);
- MiniDFSCluster cluster2 = new MiniDFSCluster.Builder(conf).build();
- MiniDFSCluster cluster3 = null;
- try {
- String dataDir2 = cluster2.getDataDirectory();
- assertEquals(new File(c2Path + "/data"), new File(dataDir2));
- //change the data dir
- conf.set(MiniDFSCluster.HDFS_MINIDFS_BASEDIR,
- testDataCluster3.getAbsolutePath());
- MiniDFSCluster.Builder builder = new MiniDFSCluster.Builder(conf);
- cluster3 = builder.build();
- String dataDir3 = cluster3.getDataDirectory();
- assertTrue("Clusters are bound to the same directory: " + dataDir2,
- !dataDir2.equals(dataDir3));
- } finally {
- MiniDFSCluster.shutdownCluster(cluster3);
- MiniDFSCluster.shutdownCluster(cluster2);
- }
- }
-
@Test(timeout=100000)
public void testIsClusterUpAfterShutdown() throws Throwable {
Configuration conf = new HdfsConfiguration();
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org