Index: hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestYarnClient.java =================================================================== --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestYarnClient.java (revision 1555431) +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestYarnClient.java (working copy) @@ -378,6 +378,13 @@ appId = createApp(rmClient, true); waitTillAccepted(rmClient, appId); + long start = System.currentTimeMillis(); + while (rmClient.getAMRMToken(appId) == null) { + if (System.currentTimeMillis() - start > 20 * 1000) { + Assert.assertNotNull("AMRM token is null", null); + Thread.sleep(100); + } + } //unmanaged AMs do return AMRM token Assert.assertNotNull(rmClient.getAMRMToken(appId));