MAPREDUCE-4095. TestJobInProgress#testLocality uses a bogus topology. Contributed by Colin Patrick McCabe

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1308519 13f79535-47bb-0310-9956-ffa450edef68

hadoop-mapreduce-project/CHANGES.txt

@@ -195,6 +195,9 @@ Release 2.0.0 - UNRELEASED
 
     MAPREDUCE-4091. tools testcases failing because of MAPREDUCE-4082 (tucu)
 
+    MAPREDUCE-4095. TestJobInProgress#testLocality uses a bogus topology.
+    (Colin Patrick McCabe via eli)
+    
 Release 0.23.3 - UNRELEASED
 
   INCOMPATIBLE CHANGES

hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestJobInProgress.java

@@ -354,13 +354,9 @@ public class TestJobInProgress {
     Node r2n3 = new NodeBase("/default/rack2/node3");
     nt.add(r2n3);
 
-    Node r2n4 = new NodeBase("/default/rack2/s1/node4");
-    nt.add(r2n4);
-
     LOG.debug("r1n1 parent: " + r1n1.getParent() + "\n" +
               "r1n2 parent: " + r1n2.getParent() + "\n" +
-              "r2n3 parent: " + r2n3.getParent() + "\n" +
-              "r2n4 parent: " + r2n4.getParent());
+              "r2n3 parent: " + r2n3.getParent());
 
     // Same host
     assertEquals(0, JobInProgress.getMatchingLevelForNodes(r1n1, r1n1, 3));
@@ -368,8 +364,6 @@ public class TestJobInProgress {
     assertEquals(1, JobInProgress.getMatchingLevelForNodes(r1n1, r1n2, 3));
     // Different rack
     assertEquals(2, JobInProgress.getMatchingLevelForNodes(r1n1, r2n3, 3));
-    // Different rack at different depth
-    assertEquals(3, JobInProgress.getMatchingLevelForNodes(r1n1, r2n4, 3));
   }
 
 }