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 2016/09/29 17:25:51 UTC
[06/14] ambari git commit: AMBARI-18477. Alert unit tests failing on
trunk (aonishuk)
AMBARI-18477. Alert unit tests failing on trunk (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/98f0cfc3
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/98f0cfc3
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/98f0cfc3
Branch: refs/heads/branch-feature-AMBARI-18456
Commit: 98f0cfc3d9397c6c834291611a0655fc691b0ac2
Parents: 2642595
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Wed Sep 28 21:39:27 2016 +0300
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Wed Sep 28 21:39:27 2016 +0300
----------------------------------------------------------------------
.../server/api/services/AmbariMetaInfoTest.java | 14 +++++++-------
.../server/metadata/AgentAlertDefinitionsTest.java | 2 +-
2 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/98f0cfc3/ambari-server/src/test/java/org/apache/ambari/server/api/services/AmbariMetaInfoTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/AmbariMetaInfoTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/AmbariMetaInfoTest.java
index 4b7826e..9f79a32 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/AmbariMetaInfoTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/AmbariMetaInfoTest.java
@@ -1925,7 +1925,7 @@ public class AmbariMetaInfoTest {
AlertDefinitionDAO dao = injector.getInstance(AlertDefinitionDAO.class);
List<AlertDefinitionEntity> definitions = dao.findAll(clusterId);
- assertEquals(10, definitions.size());
+ assertEquals(11, definitions.size());
// figure out how many of these alerts were merged into from the
// non-stack alerts.json
@@ -1937,7 +1937,7 @@ public class AmbariMetaInfoTest {
}
}
- assertEquals(1, hostAlertCount);
+ assertEquals(2, hostAlertCount);
assertEquals(9, definitions.size() - hostAlertCount);
for (AlertDefinitionEntity definition : definitions) {
@@ -1948,7 +1948,7 @@ public class AmbariMetaInfoTest {
metaInfo.reconcileAlertDefinitions(clusters);
definitions = dao.findAll();
- assertEquals(10, definitions.size());
+ assertEquals(11, definitions.size());
for (AlertDefinitionEntity definition : definitions) {
assertEquals(28, definition.getScheduleInterval().intValue());
@@ -1957,7 +1957,7 @@ public class AmbariMetaInfoTest {
// find all enabled for the cluster should find 6 (the ones from HDFS;
// it will not find the agent alert since it's not bound to the cluster)
definitions = dao.findAllEnabled(cluster.getClusterId());
- assertEquals(9, definitions.size());
+ assertEquals(10, definitions.size());
// create new definition
AlertDefinitionEntity entity = new AlertDefinitionEntity();
@@ -1976,19 +1976,19 @@ public class AmbariMetaInfoTest {
// verify the new definition is found (6 HDFS + 1 new one)
definitions = dao.findAllEnabled(cluster.getClusterId());
- assertEquals(10, definitions.size());
+ assertEquals(11, definitions.size());
// reconcile, which should disable our bad definition
metaInfo.reconcileAlertDefinitions(clusters);
// find all enabled for the cluster should find 6
definitions = dao.findAllEnabled(cluster.getClusterId());
- assertEquals(9, definitions.size());
+ assertEquals(10, definitions.size());
// find all should find 6 HDFS + 1 disabled + 1 agent alert + 2 server
// alerts
definitions = dao.findAll();
- assertEquals(11, definitions.size());
+ assertEquals(12, definitions.size());
entity = dao.findById(entity.getDefinitionId());
assertFalse(entity.getEnabled());
http://git-wip-us.apache.org/repos/asf/ambari/blob/98f0cfc3/ambari-server/src/test/java/org/apache/ambari/server/metadata/AgentAlertDefinitionsTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/metadata/AgentAlertDefinitionsTest.java b/ambari-server/src/test/java/org/apache/ambari/server/metadata/AgentAlertDefinitionsTest.java
index f5ce11e..970ceb9 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/metadata/AgentAlertDefinitionsTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/metadata/AgentAlertDefinitionsTest.java
@@ -49,7 +49,7 @@ public class AgentAlertDefinitionsTest {
public void testLoadingAgentHostAlerts() {
AmbariServiceAlertDefinitions ambariServiceAlertDefinitions = m_injector.getInstance(AmbariServiceAlertDefinitions.class);
List<AlertDefinition> definitions = ambariServiceAlertDefinitions.getAgentDefinitions();
- Assert.assertEquals(1, definitions.size());
+ Assert.assertEquals(2, definitions.size());
for( AlertDefinition definition : definitions){
Assert.assertEquals(Components.AMBARI_AGENT.name(),