----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://reviews.apache.org/r/41023/#review109218 -----------------------------------------------------------
@Dmitro, While the patch fixes the UT failure, the solution is incorrect. The root cause of why this UT fails in branch-2.2, but works in trunk is because of https://issues.apache.org/jira/browse/AMBARI-13032 Trunk Commit: https://git1-us-west.apache.org/repos/asf?p=ambari.git&a=commit&h=dca7e5d03e78b34fc2a9718182127494e772e48b Branch-2.1 Commit: https://git1-us-west.apache.org/repos/asf?p=ambari.git&a=commit&h=9f3951a85493785f4aafe5c5b0cd318cb3aaf9a1 The issue here is that as part of AMBARI-13032, in branch-2.1 the local hostname (variable s_serverHostName) is used as the hostname everywhere, whereas in trunk the hostname is hardcoded as "h1". This means that when I merged my change from trunk -> branch-2.1, I ended up introducing a partial code that uses hostname = "h1" instead of s_serverHostName. Better fix for this is to simply copy the trunk version of UpgradeResourceProviderHDP22Test.java to branch-2.2 to make then consistent. Alternative solution is to revert this patch from branch-2.2 and simply replace "h1" with s_serverHostName. I verified both the solutions. - expect(configHelper.getEffectiveDesiredTags(EasyMock.anyObject(Cluster.class), EasyMock.eq("h1"))).andReturn(new HashMap<String, Map<String, String>>() { + expect(configHelper.getEffectiveDesiredTags(EasyMock.anyObject(Cluster.class), EasyMock.eq(s_serverHostName))).andReturn(new HashMap<String, Map<String, String>>() { - Jayush Luniya On Dec. 6, 2015, 3:51 p.m., Dmitro Lisnichenko wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > https://reviews.apache.org/r/41023/ > ----------------------------------------------------------- > > (Updated Dec. 6, 2015, 3:51 p.m.) > > > Review request for Ambari, Alejandro Fernandez, Jonathan Hurley, Jayush > Luniya, and Nate Cole. > > > Bugs: AMBARI-14237 > https://issues.apache.org/jira/browse/AMBARI-14237 > > > Repository: ambari > > > Description > ------- > > Looking at https://builds.apache.org/job/Ambari-branch-2.1/ > > The following test has been failing consecutively for at least last 4 runs > (maybe more): > {code} > Results : > > Tests in error: > UpgradeResourceProviderHDP22Test.testCreateIntraStackUpgrade:383 NullPointer > {code} > > > Diffs > ----- > > > ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderHDP22Test.java > a8fa393 > > Diff: https://reviews.apache.org/r/41023/diff/ > > > Testing > ------- > > mvn clean test > > > Thanks, > > Dmitro Lisnichenko > >
