From ff9db217b8e4783ca352e56d9fa4422e47166a2f Mon Sep 17 00:00:00 2001 From: Gordon Brown Date: Fri, 18 Dec 2020 11:51:55 -0700 Subject: [PATCH] Mute failing monitoring migration tests (#66624) See #66586 for details. --- ...ortMonitoringMigrateAlertsActionTests.java | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/x-pack/plugin/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/action/TransportMonitoringMigrateAlertsActionTests.java b/x-pack/plugin/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/action/TransportMonitoringMigrateAlertsActionTests.java index 6aece93d4d61c..08a144255a90d 100644 --- a/x-pack/plugin/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/action/TransportMonitoringMigrateAlertsActionTests.java +++ b/x-pack/plugin/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/action/TransportMonitoringMigrateAlertsActionTests.java @@ -6,6 +6,16 @@ package org.elasticsearch.xpack.monitoring.action; +import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; +import static org.elasticsearch.xpack.monitoring.exporter.http.ClusterAlertHttpResource.CLUSTER_ALERT_VERSION_PARAMETERS; +import static org.elasticsearch.xpack.monitoring.exporter.http.WatcherExistsHttpResource.WATCHER_CHECK_PARAMETERS; +import static org.hamcrest.Matchers.endsWith; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.notNullValue; +import static org.hamcrest.Matchers.nullValue; +import static org.hamcrest.Matchers.startsWith; + import java.io.IOException; import java.util.Arrays; import java.util.Collection; @@ -42,16 +52,6 @@ import org.junit.After; import org.junit.Before; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; -import static org.elasticsearch.xpack.monitoring.exporter.http.ClusterAlertHttpResource.CLUSTER_ALERT_VERSION_PARAMETERS; -import static org.elasticsearch.xpack.monitoring.exporter.http.WatcherExistsHttpResource.WATCHER_CHECK_PARAMETERS; -import static org.hamcrest.Matchers.endsWith; -import static org.hamcrest.Matchers.equalTo; -import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.notNullValue; -import static org.hamcrest.Matchers.nullValue; -import static org.hamcrest.Matchers.startsWith; - @ESIntegTestCase.ClusterScope(numDataNodes = 3) public class TransportMonitoringMigrateAlertsActionTests extends MonitoringIntegTestCase { @@ -123,6 +123,7 @@ private void stopMonitoring() { )); } + @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/66586") public void testLocalAlertsRemoval() throws Exception { try { // start monitoring service @@ -202,6 +203,7 @@ public void testRepeatedLocalAlertsRemoval() throws Exception { } } + @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/66586") public void testDisabledLocalExporterAlertsRemoval() throws Exception { try { // start monitoring service @@ -244,6 +246,7 @@ public void testDisabledLocalExporterAlertsRemoval() throws Exception { } } + @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/66586") public void testLocalExporterWithAlertingDisabled() throws Exception { try { // start monitoring service