From 39e1a0b6379a96d59b023c4f4b2f040a990d6a55 Mon Sep 17 00:00:00 2001 From: Gordon Brown Date: Fri, 18 Dec 2020 12:52:15 -0700 Subject: [PATCH] Mute AzureStorageCleanupThirdPartyTests.testCleanup (#66635) See https://github.com/elastic/elasticsearch/issues/66633 --- .../AzureStorageCleanupThirdPartyTests.java | 26 ++++++++++++------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/plugins/repository-azure/src/internalClusterTest/java/org/elasticsearch/repositories/azure/AzureStorageCleanupThirdPartyTests.java b/plugins/repository-azure/src/internalClusterTest/java/org/elasticsearch/repositories/azure/AzureStorageCleanupThirdPartyTests.java index 77f14b1df061f..a96522d451f3f 100644 --- a/plugins/repository-azure/src/internalClusterTest/java/org/elasticsearch/repositories/azure/AzureStorageCleanupThirdPartyTests.java +++ b/plugins/repository-azure/src/internalClusterTest/java/org/elasticsearch/repositories/azure/AzureStorageCleanupThirdPartyTests.java @@ -19,9 +19,13 @@ package org.elasticsearch.repositories.azure; -import com.azure.storage.blob.BlobContainerClient; -import com.azure.storage.blob.BlobServiceClient; -import com.azure.storage.blob.models.BlobStorageException; +import static org.hamcrest.Matchers.blankOrNullString; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.not; + +import java.net.HttpURLConnection; +import java.util.Collection; + import org.elasticsearch.action.ActionRunnable; import org.elasticsearch.action.support.PlainActionFuture; import org.elasticsearch.action.support.master.AcknowledgedResponse; @@ -33,12 +37,9 @@ import org.elasticsearch.repositories.AbstractThirdPartyRepositoryTestCase; import org.elasticsearch.repositories.blobstore.BlobStoreRepository; -import java.net.HttpURLConnection; -import java.util.Collection; - -import static org.hamcrest.Matchers.blankOrNullString; -import static org.hamcrest.Matchers.equalTo; -import static org.hamcrest.Matchers.not; +import com.azure.storage.blob.BlobContainerClient; +import com.azure.storage.blob.BlobServiceClient; +import com.azure.storage.blob.models.BlobStorageException; public class AzureStorageCleanupThirdPartyTests extends AbstractThirdPartyRepositoryTestCase { @@ -121,4 +122,11 @@ private void ensureSasTokenPermissions() { })); future.actionGet(); } + + @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/66633") + @Override + // This override is only here so we can mute the test without muting the whole suite, remove it when the test is fixed + public void testCleanup() throws Exception { + super.testCleanup(); + } }