YARN-2018: Merging r1592783 from trunk to branch-2.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1592784 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Arpit Agarwal 2014-05-06 15:47:01 +00:00
parent 6b7d074a54
commit c03108299b
2 changed files with 5 additions and 3 deletions

View File

@ -67,6 +67,9 @@ Release 2.5.0 - UNRELEASED
YARN-738. TestClientRMTokens is failing irregularly while running all yarn
tests (Ming Ma via jlowe)
YARN-2018. TestClientRMService.testTokenRenewalWrongUser fails after
HADOOP-10562 (Ming Ma via Arpit Agarwal)
Release 2.4.1 - UNRELEASED
INCOMPATIBLE CHANGES

View File

@ -478,9 +478,8 @@ public class TestClientRMService {
checkTokenRenewal(owner, other);
return null;
} catch (YarnException ex) {
Assert.assertTrue(ex.getMessage().contains(
"Client " + owner.getUserName() +
" tries to renew a token with renewer specified as " +
Assert.assertTrue(ex.getMessage().contains(owner.getUserName() +
" tries to renew a token with renewer " +
other.getUserName()));
throw ex;
}