AMBARI-14237. UT failure: UpgradeResourceProviderHDP22Test.testCreateIntraStackUpgrade:383 NullPointer (dlysnichenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e15d1e0f Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e15d1e0f Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e15d1e0f Branch: refs/heads/branch-2.2 Commit: e15d1e0fb3777f79cb473cf5de0f7a6bf30e63bd Parents: 302e3f2 Author: Lisnichenko Dmitro <dlysniche...@hortonworks.com> Authored: Mon Dec 7 10:00:19 2015 +0200 Committer: Lisnichenko Dmitro <dlysniche...@hortonworks.com> Committed: Mon Dec 7 10:00:19 2015 +0200 ---------------------------------------------------------------------- .../internal/UpgradeResourceProviderHDP22Test.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/e15d1e0f/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderHDP22Test.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderHDP22Test.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderHDP22Test.java index a8fa393..2ef1aa0 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderHDP22Test.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderHDP22Test.java @@ -140,11 +140,11 @@ public class UpgradeResourceProviderHDP22Test { { put("hive-site", new HashMap<String, String>() { { - put("tag", configTagVersion1); + put("tag", configTagVersion2); } }); } - }).times(3); + }).anyTimes(); expect(configHelper.getEffectiveDesiredTags(EasyMock.anyObject(Cluster.class), EasyMock.eq("h1"))).andReturn(new HashMap<String, Map<String, String>>() { { @@ -154,7 +154,7 @@ public class UpgradeResourceProviderHDP22Test { } }); } - }).times(2); + }).anyTimes(); expect(configHelper.getEffectiveConfigProperties(EasyMock.anyObject(Cluster.class), EasyMock.anyObject(Map.class))).andReturn( new HashMap<String, Map<String, String>>() { @@ -168,7 +168,7 @@ public class UpgradeResourceProviderHDP22Test { { put("hive-site", configTagVersion2Properties); } - }).times(2); + }).anyTimes(); expect(configHelper.getMergedConfig(EasyMock.anyObject(Map.class), EasyMock.anyObject(Map.class))).andReturn(new HashMap<String, String>()).anyTimes();
