From 456e6e1de653059465d25fd35b3f447e57c70aab Mon Sep 17 00:00:00 2001 From: Vinod Kumar Vavilapalli Date: Wed, 28 Sep 2011 06:04:54 +0000 Subject: [PATCH] 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 --- hadoop-mapreduce-project/CHANGES.txt | 2 ++ .../src/test/java/org/apache/hadoop/yarn/TestRPC.java | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index 608a5e9a5d2..247b0423688 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -1435,6 +1435,8 @@ Release 0.23.0 - Unreleased 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) + MAPREDUCE-3110. Fixed TestRPC failure. (vinodkv) + Release 0.22.0 - Unreleased INCOMPATIBLE CHANGES diff --git a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/TestRPC.java b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/TestRPC.java index 82b90d2f5ac..a855cc6f218 100644 --- a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/TestRPC.java +++ b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/TestRPC.java @@ -90,10 +90,10 @@ public class TestRPC { .newRecord(GetNewApplicationRequest.class)); Assert.fail("Excepted RPC call to fail with unknown method."); } catch (YarnRemoteException e) { - Assert.assertEquals("Unknown method getNewApplication called on " - + "org.apache.hadoop.yarn.proto.ClientRMProtocol" - + "$ClientRMProtocolService$BlockingInterface protocol.", e - .getMessage()); + Assert.assertTrue(e.getMessage().matches( + "Unknown method getNewApplication called on.*" + + "org.apache.hadoop.yarn.proto.ClientRMProtocol" + + "\\$ClientRMProtocolService\\$BlockingInterface protocol.")); } }