ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dmitriu...@apache.org
Subject ambari git commit: AMBARI-14237. UT failure: UpgradeResourceProviderHDP22Test.testCreateIntraStackUpgrade:383 NullPointer (dlysnichenko)
Date Mon, 07 Dec 2015 07:47:51 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 4f0acbf1a -> 40ab02040


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/40ab0204
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/40ab0204
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/40ab0204

Branch: refs/heads/trunk
Commit: 40ab0204082e7c3a2d92fb3770ec7f9d103714b2
Parents: 4f0acbf
Author: Lisnichenko Dmitro <dlysnichenko@hortonworks.com>
Authored: Mon Dec 7 09:48:11 2015 +0200
Committer: Lisnichenko Dmitro <dlysnichenko@hortonworks.com>
Committed: Mon Dec 7 09:48:11 2015 +0200

----------------------------------------------------------------------
 .../internal/UpgradeResourceProviderHDP22Test.java           | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/40ab0204/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 b0e3467..408440a 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", configTagVersion1);
+            put("tag", configTagVersion2);
           }
         });
       }
-    }).times(3);
+    }).anyTimes();
 
     expect(configHelper.getEffectiveDesiredTags(EasyMock.anyObject(Cluster.class), EasyMock.eq("h1"))).andReturn(new
HashMap<String, Map<String, String>>() {
       {
@@ -145,7 +145,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>>() {
@@ -159,7 +159,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();


Mime
View raw message