MAPREDUCE-3110. svn merge -c r1176739 --ignore-ancestry ../../trunk/

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1176740 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Vinod Kumar Vavilapalli 2011-09-28 06:04:54 +00:00
parent d04e6af4b7
commit 456e6e1de6
2 changed files with 6 additions and 4 deletions

View File

@ -1435,6 +1435,8 @@ Release 0.23.0 - Unreleased
MAPREDUCE-2843. Fixed the node-table to be completely displayed and making MAPREDUCE-2843. Fixed the node-table to be completely displayed and making
node entries on RM UI to be sortable. (Abhijit Suresh Shingate via vinodkv) node entries on RM UI to be sortable. (Abhijit Suresh Shingate via vinodkv)
MAPREDUCE-3110. Fixed TestRPC failure. (vinodkv)
Release 0.22.0 - Unreleased Release 0.22.0 - Unreleased
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

View File

@ -90,10 +90,10 @@ public class TestRPC {
.newRecord(GetNewApplicationRequest.class)); .newRecord(GetNewApplicationRequest.class));
Assert.fail("Excepted RPC call to fail with unknown method."); Assert.fail("Excepted RPC call to fail with unknown method.");
} catch (YarnRemoteException e) { } catch (YarnRemoteException e) {
Assert.assertEquals("Unknown method getNewApplication called on " Assert.assertTrue(e.getMessage().matches(
+ "org.apache.hadoop.yarn.proto.ClientRMProtocol" "Unknown method getNewApplication called on.*"
+ "$ClientRMProtocolService$BlockingInterface protocol.", e + "org.apache.hadoop.yarn.proto.ClientRMProtocol"
.getMessage()); + "\\$ClientRMProtocolService\\$BlockingInterface protocol."));
} }
} }