From cc2f8391175a2d21e2a98f2bbf5ebcaec7a357fc Mon Sep 17 00:00:00 2001 From: "Doroszlai, Attila" Date: Mon, 26 Feb 2018 17:55:59 +0100 Subject: [PATCH 1/2] AMBARI-22878. Fix unit tests --- .../ExecutionCommandWrapperTest.java | 2 +- .../server/agent/HeartbeatProcessorTest.java | 2 +- .../ambari/server/agent/TestHeartbeatHandler.java | 2 +- .../configuration/RecoveryConfigHelperTest.java | 12 ++++++------ .../ServiceDependencyResourceProviderTest.java | 11 ++++++----- .../VersionDefinitionResourceProviderTest.java | 2 +- .../upgrade/HostVersionOutOfSyncListenerTest.java | 4 ++-- .../apache/ambari/server/orm/OrmTestHelper.java | 15 +++++++-------- .../server/orm/dao/AlertDispatchDAOTest.java | 2 +- .../ambari/server/orm/dao/AlertsDAOTest.java | 2 +- .../ambari/server/state/ConfigGroupTest.java | 1 + .../apache/ambari/server/state/ServiceTest.java | 2 +- .../state/alerts/InitialAlertEventTest.java | 2 +- .../server/state/cluster/ClusterDeadlockTest.java | 2 +- .../ambari/server/state/cluster/ClustersTest.java | 2 +- .../server/testing/DBInconsistencyTests.java | 2 +- 16 files changed, 33 insertions(+), 32 deletions(-) diff --git a/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/ExecutionCommandWrapperTest.java b/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/ExecutionCommandWrapperTest.java index 50653eb9888..3fd5ce11375 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/ExecutionCommandWrapperTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/ExecutionCommandWrapperTest.java @@ -116,7 +116,7 @@ public static void setup() throws AmbariException { OrmTestHelper helper = injector.getInstance(OrmTestHelper.class); RepositoryVersionEntity repositoryVersion = helper.getOrCreateRepositoryVersion(cluster1); - ServiceGroup serviceGroup = cluster1.addServiceGroup("CORE", "HDP-2.6.0"); + ServiceGroup serviceGroup = cluster1.addServiceGroup("CORE", cluster1.getDesiredStackVersion().getStackId()); cluster1.addService(serviceGroup, "HDFS", "HDFS", repositoryVersion); SERVICE_SITE_CLUSTER = new HashMap<>(); diff --git a/ambari-server/src/test/java/org/apache/ambari/server/agent/HeartbeatProcessorTest.java b/ambari-server/src/test/java/org/apache/ambari/server/agent/HeartbeatProcessorTest.java index a23fae966a4..53e09844683 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/agent/HeartbeatProcessorTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/agent/HeartbeatProcessorTest.java @@ -1311,7 +1311,7 @@ public void testComponentInProgressStatusSafeAfterStatusReport() throws Exceptio */ private Service addService(Cluster cluster, String serviceName) throws AmbariException { RepositoryVersionEntity repositoryVersion = helper.getOrCreateRepositoryVersion(cluster); - ServiceGroup serviceGroup = cluster.addServiceGroup("CORE", "HDP-2.6.0"); + ServiceGroup serviceGroup = cluster.addServiceGroup("CORE", cluster.getDesiredStackVersion().getStackId()); return cluster.addService(serviceGroup, serviceName, serviceName, repositoryVersion); } } diff --git a/ambari-server/src/test/java/org/apache/ambari/server/agent/TestHeartbeatHandler.java b/ambari-server/src/test/java/org/apache/ambari/server/agent/TestHeartbeatHandler.java index 2a7b8b2784b..3e48ba9823c 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/agent/TestHeartbeatHandler.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/agent/TestHeartbeatHandler.java @@ -1604,7 +1604,7 @@ private File createTestKeytabData(HeartBeatHandler heartbeatHandler) throws Exce */ private Service addService(Cluster cluster, String serviceName) throws AmbariException { RepositoryVersionEntity repositoryVersion = helper.getOrCreateRepositoryVersion(cluster); - ServiceGroup serviceGroup = cluster.addServiceGroup("CORE", "HDP-2.6.0"); + ServiceGroup serviceGroup = cluster.addServiceGroup("CORE", DummyStackId); return cluster.addService(serviceGroup, serviceName, serviceName, repositoryVersion); } diff --git a/ambari-server/src/test/java/org/apache/ambari/server/configuration/RecoveryConfigHelperTest.java b/ambari-server/src/test/java/org/apache/ambari/server/configuration/RecoveryConfigHelperTest.java index f0fff2b19d7..ff3a1090b95 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/configuration/RecoveryConfigHelperTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/configuration/RecoveryConfigHelperTest.java @@ -148,7 +148,7 @@ public void testServiceComponentInstalled() Cluster cluster = heartbeatTestHelper.getDummyCluster(); RepositoryVersionEntity repositoryVersion = helper.getOrCreateRepositoryVersion(cluster); - ServiceGroup serviceGroup = cluster.addServiceGroup("CORE", "HDP-2.6.0.0"); + ServiceGroup serviceGroup = cluster.addServiceGroup("CORE", cluster.getDesiredStackVersion()); Service hdfs = cluster.addService(serviceGroup, HDFS, HDFS, repositoryVersion); hdfs.addServiceComponent(DATANODE).setRecoveryEnabled(true); @@ -183,7 +183,7 @@ public void testServiceComponentUninstalled() throws Exception { Cluster cluster = heartbeatTestHelper.getDummyCluster(); RepositoryVersionEntity repositoryVersion = helper.getOrCreateRepositoryVersion(cluster); - ServiceGroup serviceGroup = cluster.addServiceGroup("CORE", "HDP-2.6.0.0"); + ServiceGroup serviceGroup = cluster.addServiceGroup("CORE", cluster.getDesiredStackVersion().getStackId()); Service hdfs = cluster.addService(serviceGroup, HDFS, HDFS, repositoryVersion); hdfs.addServiceComponent(DATANODE).setRecoveryEnabled(true); @@ -220,7 +220,7 @@ public void testClusterEnvConfigChanged() throws Exception { Cluster cluster = heartbeatTestHelper.getDummyCluster(); RepositoryVersionEntity repositoryVersion = helper.getOrCreateRepositoryVersion(cluster); - ServiceGroup serviceGroup = cluster.addServiceGroup("CORE", "HDP-2.6.0.0"); + ServiceGroup serviceGroup = cluster.addServiceGroup("CORE", cluster.getDesiredStackVersion().getStackId()); Service hdfs = cluster.addService(serviceGroup, HDFS, HDFS, repositoryVersion); hdfs.addServiceComponent(DATANODE).setRecoveryEnabled(true); @@ -261,7 +261,7 @@ public void testMaintenanceModeChanged() throws Exception { Cluster cluster = heartbeatTestHelper.getDummyCluster(); RepositoryVersionEntity repositoryVersion = helper.getOrCreateRepositoryVersion(cluster); - ServiceGroup serviceGroup = cluster.addServiceGroup("CORE", "HDP-2.6.0.0"); + ServiceGroup serviceGroup = cluster.addServiceGroup("CORE", cluster.getDesiredStackVersion().getStackId()); Service hdfs = cluster.addService(serviceGroup, HDFS, HDFS, repositoryVersion); hdfs.addServiceComponent(DATANODE).setRecoveryEnabled(true); @@ -297,7 +297,7 @@ public void testServiceComponentRecoveryChanged() throws Exception { Cluster cluster = heartbeatTestHelper.getDummyCluster(); RepositoryVersionEntity repositoryVersion = helper.getOrCreateRepositoryVersion(cluster); - ServiceGroup serviceGroup = cluster.addServiceGroup("CORE", "HDP-2.6.0.0"); + ServiceGroup serviceGroup = cluster.addServiceGroup("CORE", cluster.getDesiredStackVersion().getStackId()); Service hdfs = cluster.addService(serviceGroup, HDFS, HDFS, repositoryVersion); hdfs.addServiceComponent(DATANODE).setRecoveryEnabled(true); @@ -341,7 +341,7 @@ public void testMultiNodeCluster() RepositoryVersionEntity repositoryVersion = helper.getOrCreateRepositoryVersion(cluster); // Add HDFS service with DATANODE component to the cluster - ServiceGroup serviceGroup = cluster.addServiceGroup("CORE", "HDP-2.6.0.0"); + ServiceGroup serviceGroup = cluster.addServiceGroup("CORE", cluster.getDesiredStackVersion().getStackId()); Service hdfs = cluster.addService(serviceGroup, HDFS, HDFS, repositoryVersion); hdfs.addServiceComponent(DATANODE).setRecoveryEnabled(true); diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ServiceDependencyResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ServiceDependencyResourceProviderTest.java index f4d4d2d0dbb..b3099307816 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ServiceDependencyResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ServiceDependencyResourceProviderTest.java @@ -341,16 +341,17 @@ private Cluster createDefaultCluster(String clusterName) throws Exception { final String host2 = "b" + getUniqueName(); final String host3 = "c" + getUniqueName(); - setupClusterWithHosts(clusterName, "HDP-2.0.6", Arrays.asList(host1, host2, host3), "centos6"); + String stackId = "HDP-2.0.6"; + setupClusterWithHosts(clusterName, stackId, Arrays.asList(host1, host2, host3), "centos6"); Cluster cluster = clusters.getCluster(clusterName); - cluster.setDesiredStackVersion(new StackId("HDP-2.0.6")); - cluster.setCurrentStackVersion(new StackId("HDP-2.0.6")); + cluster.setDesiredStackVersion(new StackId(stackId)); + cluster.setCurrentStackVersion(new StackId(stackId)); RepositoryVersionEntity repositoryVersion = repositoryVersion206; - ServiceGroup serviceGroupCore = cluster.addServiceGroup(SERVICE_GROUP_NAME_CORE, "HDP-1.0"); - ServiceGroup serviceGroupTest = cluster.addServiceGroup(SERVICE_GROUP_NAME_TEST, "HDP-1.0"); + ServiceGroup serviceGroupCore = cluster.addServiceGroup(SERVICE_GROUP_NAME_CORE, stackId); + ServiceGroup serviceGroupTest = cluster.addServiceGroup(SERVICE_GROUP_NAME_TEST, stackId); Service hdfs = cluster.addService(serviceGroupCore, SERVICE_NAME_HDFS, SERVICE_NAME_HDFS, repositoryVersion); Service yarn = cluster.addService(serviceGroupCore, SERVICE_NAME_YARN, SERVICE_NAME_YARN, repositoryVersion); diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/VersionDefinitionResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/VersionDefinitionResourceProviderTest.java index 0c9805c6207..235e0f02284 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/VersionDefinitionResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/VersionDefinitionResourceProviderTest.java @@ -698,7 +698,7 @@ private void makeService(String serviceName, RepositoryVersionEntity serviceRepo } catch (AmbariException e) { clusters.addCluster(clusterName, parentEntity.getStackId()); cluster = clusters.getCluster(clusterName); - serviceGroup = cluster.addServiceGroup(serviceGroupName, "HDP-1.0"); + serviceGroup = cluster.addServiceGroup(serviceGroupName, cluster.getDesiredStackVersion().getStackId()); } cluster.addService(serviceGroup, serviceName, serviceName, serviceRepo); diff --git a/ambari-server/src/test/java/org/apache/ambari/server/events/listeners/upgrade/HostVersionOutOfSyncListenerTest.java b/ambari-server/src/test/java/org/apache/ambari/server/events/listeners/upgrade/HostVersionOutOfSyncListenerTest.java index 4f05d9ba752..c4bd1de473c 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/events/listeners/upgrade/HostVersionOutOfSyncListenerTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/events/listeners/upgrade/HostVersionOutOfSyncListenerTest.java @@ -151,7 +151,7 @@ private RepositoryVersionEntity createClusterAndHosts(String INSTALLED_VERSION, Map> zkTopology = new HashMap<>(); List zkServerHosts = Arrays.asList(0, 1, 2); zkTopology.put("ZOOKEEPER_SERVER", new ArrayList<>(zkServerHosts)); - ServiceGroup serviceGroup = c1.addServiceGroup("CORE", "HDP-1.0"); + ServiceGroup serviceGroup = c1.addServiceGroup("CORE", this.stackId); addService(c1, serviceGroup, hostList, zkTopology, "ZOOKEEPER", repositoryVersionEntity); // install new version @@ -477,7 +477,7 @@ public void testComponentHostVersionNotRequired() throws Exception { .put("NAMENODE", Lists.newArrayList(0)) .put("DATANODE", Lists.newArrayList(1)) .build(); - ServiceGroup serviceGroup = c1.addServiceGroup("CORE", "HDP-1.0"); + ServiceGroup serviceGroup = c1.addServiceGroup("CORE", this.stackId); addService(c1, serviceGroup, allHosts, topology, "HDFS", repo); topology = new ImmutableMap.Builder>() diff --git a/ambari-server/src/test/java/org/apache/ambari/server/orm/OrmTestHelper.java b/ambari-server/src/test/java/org/apache/ambari/server/orm/OrmTestHelper.java index 3be8333122b..a1f6a0fb4c9 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/orm/OrmTestHelper.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/orm/OrmTestHelper.java @@ -144,6 +144,7 @@ public class OrmTestHelper { @Inject private StackDAO stackDAO; + private static final StackId HDP_206 = new StackId("HDP", "2.0.6"); public static final StackId STACK_ID = new StackId("HDP", "2.2.0"); public static final String CLUSTER_NAME = "test_cluster1"; public static final String SERVICE_GROUP_NAME = "CORE"; @@ -372,7 +373,7 @@ public Long createCluster(String clusterName) throws Exception { ClusterDAO clusterDAO = injector.getInstance(ClusterDAO.class); StackDAO stackDAO = injector.getInstance(StackDAO.class); - StackEntity stackEntity = stackDAO.find("HDP", "2.0.6"); + StackEntity stackEntity = stackDAO.find(HDP_206); assertNotNull(stackEntity); ClusterEntity clusterEntity = new ClusterEntity(); @@ -410,13 +411,12 @@ public Cluster buildNewCluster(Clusters clusters, ServiceFactory serviceFactory, ServiceComponentFactory componentFactory, ServiceComponentHostFactory schFactory, String hostName) throws Exception { String clusterName = "cluster-" + System.currentTimeMillis(); - StackId stackId = new StackId("HDP", "2.0.6"); - createStack(stackId); + createStack(HDP_206); - clusters.addCluster(clusterName, stackId); + clusters.addCluster(clusterName, HDP_206); Cluster cluster = clusters.getCluster(clusterName); - ServiceGroup serviceGroup = cluster.addServiceGroup(SERVICE_GROUP_NAME, stackId.getStackId()); + ServiceGroup serviceGroup = cluster.addServiceGroup(SERVICE_GROUP_NAME, HDP_206.getStackId()); cluster = initializeClusterWithStack(cluster); addHost(clusters, cluster, hostName); @@ -427,9 +427,8 @@ public Cluster buildNewCluster(Clusters clusters, } public Cluster initializeClusterWithStack(Cluster cluster) throws Exception { - StackId stackId = new StackId("HDP", "2.0.6"); - cluster.setDesiredStackVersion(stackId); - getOrCreateRepositoryVersion(stackId, stackId.getStackVersion()); + cluster.setDesiredStackVersion(HDP_206); + getOrCreateRepositoryVersion(HDP_206, HDP_206.getStackVersion()); return cluster; } diff --git a/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/AlertDispatchDAOTest.java b/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/AlertDispatchDAOTest.java index c20ce18758a..5169dfeb6fe 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/AlertDispatchDAOTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/AlertDispatchDAOTest.java @@ -117,7 +117,7 @@ public void setup() throws Exception { EventBusSynchronizer.synchronizeAmbariEventPublisher(m_injector); m_cluster = m_clusters.getClusterById(m_helper.createCluster()); - serviceGroup = m_cluster.addServiceGroup("CORE", "HDP-1.0"); + serviceGroup = m_cluster.addServiceGroup("CORE", m_cluster.getDesiredStackVersion().getStackId()); m_helper.initializeClusterWithStack(m_cluster); } diff --git a/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/AlertsDAOTest.java b/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/AlertsDAOTest.java index 2d7826bf4a4..7fdf5933913 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/AlertsDAOTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/AlertsDAOTest.java @@ -123,7 +123,7 @@ public void setup() throws Exception { // install YARN so there is at least 1 service installed and no // unexpected alerts since the test YARN service doesn't have any alerts m_cluster = m_clusters.getClusterById(m_helper.createCluster()); - serviceGroup = m_cluster.addServiceGroup("CORE", "HDP-1.0"); + serviceGroup = m_cluster.addServiceGroup("CORE", m_cluster.getDesiredStackVersion().getStackId()); m_helper.initializeClusterWithStack(m_cluster); m_helper.addHost(m_clusters, m_cluster, HOSTNAME); m_helper.installYarnService(m_cluster, m_serviceFactory, diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/ConfigGroupTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/ConfigGroupTest.java index 062389a7804..6194085eb23 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/state/ConfigGroupTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/state/ConfigGroupTest.java @@ -122,6 +122,7 @@ ConfigGroup createConfigGroup() throws AmbariException { ServiceGroupEntity serviceGroupEntity = new ServiceGroupEntity(); serviceGroupEntity.setClusterEntity(clusterEntity); serviceGroupEntity.setServiceGroupName("default"); + serviceGroupEntity.setStack(clusterEntity.getDesiredStack()); serviceGroupDAO.create(serviceGroupEntity); ClusterServiceEntity clusterServiceEntity = new ClusterServiceEntity(); diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/ServiceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/ServiceTest.java index b0ee246b373..3c38c5bd585 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/state/ServiceTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/state/ServiceTest.java @@ -90,7 +90,7 @@ public void teardown() throws AmbariException, SQLException { @Test public void testCanBeRemoved() throws Exception{ - ServiceGroup serviceGroup = cluster.addServiceGroup("CORE", "HDP-1.0"); + ServiceGroup serviceGroup = cluster.addServiceGroup("CORE", STACK_ID.getStackId()); Service service = cluster.addService(serviceGroup, "HDFS", "HDFS", repositoryVersion); for (State state : State.values()) { diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/alerts/InitialAlertEventTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/alerts/InitialAlertEventTest.java index 294f6d8dcac..6b827c9a3cd 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/state/alerts/InitialAlertEventTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/state/alerts/InitialAlertEventTest.java @@ -181,7 +181,7 @@ public void testInitialAlertEvent() throws Exception { private void installHdfsService() throws Exception { String serviceName = "HDFS"; - ServiceGroup serviceGroup = m_cluster.addServiceGroup("CORE", "HDP-1.0"); + ServiceGroup serviceGroup = m_cluster.addServiceGroup("CORE", STACK_ID.getStackId()); m_serviceFactory.createNew(m_cluster, serviceGroup, Collections.emptyList(), serviceName, serviceName, m_repositoryVersion); Service service = m_cluster.getService(serviceName); diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClusterDeadlockTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClusterDeadlockTest.java index 9970b9c90ca..11464ddda54 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClusterDeadlockTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClusterDeadlockTest.java @@ -143,7 +143,7 @@ public void setup() throws Exception { clusters.mapHostToCluster(hostName, "c1"); } - serviceGroup = cluster.addServiceGroup("CORE", "HDP-1.0"); + serviceGroup = cluster.addServiceGroup("CORE", stackId.getStackId()); Service service = installService("HDFS", serviceGroup); addServiceComponent(service, "NAMENODE"); addServiceComponent(service, "DATANODE"); diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClustersTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClustersTest.java index 849326b6dc2..438079a24f4 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClustersTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClustersTest.java @@ -427,7 +427,7 @@ public void testDeleteCluster() throws Exception { // host config override host1.addDesiredConfig(cluster.getClusterId(), true, "_test", config2); - ServiceGroup serviceGroup = cluster.addServiceGroup("CORE", "HDP-1.0"); + ServiceGroup serviceGroup = cluster.addServiceGroup("CORE", stackId.getStackId()); Service hdfs = cluster.addService(serviceGroup, "HDFS", "HDFS", repositoryVersion); //Assert.assertNotNull(injector.getInstance(ClusterServiceDAO.class).findByClusterAndServiceNames(c1, "HDFS")); diff --git a/ambari-server/src/test/java/org/apache/ambari/server/testing/DBInconsistencyTests.java b/ambari-server/src/test/java/org/apache/ambari/server/testing/DBInconsistencyTests.java index c78b0ee2e09..b2e2c6d80be 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/testing/DBInconsistencyTests.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/testing/DBInconsistencyTests.java @@ -91,7 +91,7 @@ public void testOrphanedSCHDesiredEntityReAdd() throws Exception { Assert.assertNotNull(clusterId); Cluster cluster = clusters.getCluster(OrmTestHelper.CLUSTER_NAME); - ServiceGroup serviceGroup = cluster.addServiceGroup("CORE", "HDP-1.0"); + ServiceGroup serviceGroup = cluster.addServiceGroup("CORE", cluster.getDesiredStackVersion()); Assert.assertNotNull(cluster); helper.addHost(clusters, cluster, "h1"); From 25a1fc5aeb000c8d667b33fd96cc33916b340e1c Mon Sep 17 00:00:00 2001 From: "Doroszlai, Attila" Date: Mon, 26 Feb 2018 19:41:07 +0100 Subject: [PATCH 2/2] AMBARI-22878. Fix unit tests +1 --- .../ambari/server/state/alerts/AlertEventPublisherTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/alerts/AlertEventPublisherTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/alerts/AlertEventPublisherTest.java index 74201e0f9d7..1ab33859704 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/state/alerts/AlertEventPublisherTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/state/alerts/AlertEventPublisherTest.java @@ -298,7 +298,7 @@ private void installHdfsService() throws Exception { cluster.getCurrentStackVersion(), REPO_VERSION); String serviceName = "HDFS"; - ServiceGroup serviceGroup = cluster.addServiceGroup("CORE", "HDP-1.0"); + ServiceGroup serviceGroup = cluster.addServiceGroup("CORE", cluster.getDesiredStackVersion().getStackId()); serviceFactory.createNew(cluster, serviceGroup, Collections.emptyList(), serviceName, serviceName, repositoryVersion); Service service = cluster.getService(serviceName);