Author: szetszwo
Date: Thu Jun 28 01:25:32 2012
New Revision: 1354792

URL: http://svn.apache.org/viewvc?rev=1354792&view=rev
Log:
svn merge -c -1354790 for reverting HDFS-3576 since it requires more changes.

Modified:
    hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/TestFileSystem.java

Modified: hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/TestFileSystem.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/TestFileSystem.java?rev=1354792&r1=1354791&r2=1354792&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/TestFileSystem.java (original)
+++ hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/TestFileSystem.java Thu Jun 28 01:25:32 2012
@@ -39,7 +39,6 @@ import junit.framework.TestCase;
 import org.apache.commons.logging.Log;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.conf.Configured;
-import org.apache.hadoop.hdfs.DFSConfigKeys;
 import org.apache.hadoop.hdfs.MiniDFSCluster;
 import org.apache.hadoop.hdfs.server.namenode.NameNode;
 import org.apache.hadoop.fs.shell.CommandFormat;
@@ -510,10 +509,10 @@ public class TestFileSystem extends Test
     
     {
       try {
-        runTestCache(DFSConfigKeys.DFS_NAMENODE_RPC_PORT_DEFAULT);
+        runTestCache(NameNode.DEFAULT_PORT);
       } catch(java.net.BindException be) {
-        LOG.warn("Cannot test NameNode's default RPC port (="
-            + DFSConfigKeys.DFS_NAMENODE_RPC_PORT_DEFAULT + ")", be);
+        LOG.warn("Cannot test NameNode.DEFAULT_PORT (="
+            + NameNode.DEFAULT_PORT + ")", be);
       }
 
       runTestCache(0);
@@ -536,11 +535,11 @@ public class TestFileSystem extends Test
         }
       }
       
-      if (port == DFSConfigKeys.DFS_NAMENODE_RPC_PORT_DEFAULT) {
+      if (port == NameNode.DEFAULT_PORT) {
         //test explicit default port
-        URI uri2 = new URI(uri.getScheme(), uri.getUserInfo(), uri.getHost(),
-            DFSConfigKeys.DFS_NAMENODE_RPC_PORT_DEFAULT, uri.getPath(),
-            uri.getQuery(), uri.getFragment());
+        URI uri2 = new URI(uri.getScheme(), uri.getUserInfo(),
+            uri.getHost(), NameNode.DEFAULT_PORT, uri.getPath(),
+            uri.getQuery(), uri.getFragment());  
         LOG.info("uri2=" + uri2);
         FileSystem fs = FileSystem.get(uri2, conf);
         checkPath(cluster, fs);