Repository: ambari Updated Branches: refs/heads/branch-2.2 302e3f21e -> e15d1e0fb refs/heads/trunk 40ab02040 -> 285539424
Revert "AMBARI-14237. UT failure: UpgradeResourceProviderHDP22Test.testCreateIntraStackUpgrade:383 NullPointer (dlysnichenko)" This reverts commit 40ab0204082e7c3a2d92fb3770ec7f9d103714b2. Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/28553942 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/28553942 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/28553942 Branch: refs/heads/trunk Commit: 285539424ef5285708178b553e7ed05d38d0a754 Parents: 40ab020 Author: Lisnichenko Dmitro <dlysniche...@hortonworks.com> Authored: Mon Dec 7 09:57:23 2015 +0200 Committer: Lisnichenko Dmitro <dlysniche...@hortonworks.com> Committed: Mon Dec 7 09:57:23 2015 +0200 ---------------------------------------------------------------------- .../internal/UpgradeResourceProviderHDP22Test.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/28553942/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 408440a..b0e3467 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 @@ -131,11 +131,11 @@ public class UpgradeResourceProviderHDP22Test { { put("hive-site", new HashMap<String, String>() { { - put("tag", configTagVersion2); + put("tag", configTagVersion1); } }); } - }).anyTimes(); + }).times(3); expect(configHelper.getEffectiveDesiredTags(EasyMock.anyObject(Cluster.class), EasyMock.eq("h1"))).andReturn(new HashMap<String, Map<String, String>>() { { @@ -145,7 +145,7 @@ public class UpgradeResourceProviderHDP22Test { } }); } - }).anyTimes(); + }).times(2); expect(configHelper.getEffectiveConfigProperties(EasyMock.anyObject(Cluster.class), EasyMock.anyObject(Map.class))).andReturn( new HashMap<String, Map<String, String>>() { @@ -159,7 +159,7 @@ public class UpgradeResourceProviderHDP22Test { { put("hive-site", configTagVersion2Properties); } - }).anyTimes(); + }).times(2); expect(configHelper.getMergedConfig(EasyMock.anyObject(Map.class), EasyMock.anyObject(Map.class))).andReturn(new HashMap<String, String>()).anyTimes();
