You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by jo...@apache.org on 2017/04/06 18:58:24 UTC
[35/50] ambari git commit: AMBARI-20672 - Cluster Merge At End Of
Upgrade Creation Cascades Unnecessarily (part2) (jonathanhurley)
AMBARI-20672 - Cluster Merge At End Of Upgrade Creation Cascades Unnecessarily (part2) (jonathanhurley)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8c2ff91c
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8c2ff91c
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8c2ff91c
Branch: refs/heads/branch-feature-AMBARI-12556
Commit: 8c2ff91c7c632d01c35dec160b0debdab730ca82
Parents: fe0aa44
Author: Jonathan Hurley <jh...@hortonworks.com>
Authored: Tue Apr 4 17:14:33 2017 -0400
Committer: Jonathan Hurley <jh...@hortonworks.com>
Committed: Tue Apr 4 17:14:33 2017 -0400
----------------------------------------------------------------------
.../ambari/server/state/alerts/AlertStateChangedEventTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/8c2ff91c/ambari-server/src/test/java/org/apache/ambari/server/state/alerts/AlertStateChangedEventTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/alerts/AlertStateChangedEventTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/alerts/AlertStateChangedEventTest.java
index d4dbdc8..f507cab 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/state/alerts/AlertStateChangedEventTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/state/alerts/AlertStateChangedEventTest.java
@@ -572,7 +572,7 @@ public class AlertStateChangedEventTest extends EasyMockSupport {
EasyMock.reset(clusters);
EasyMock.expect(clusters.getClusterById(EasyMock.anyLong())).andReturn(cluster).atLeastOnce();
- EasyMock.expect(cluster.getUpgradeInProgress()).andReturn(null).anyTimes();
+ EasyMock.expect(cluster.getUpgradeInProgress()).andReturn(EasyMock.createMock(UpgradeEntity.class)).anyTimes();
EasyMock.expect(cluster.isUpgradeSuspended()).andReturn(true).anyTimes();
}