From d334d4c8bf84761ce9e8299e8731743eea29a6a2 Mon Sep 17 00:00:00 2001 From: Yang Wang Date: Tue, 7 May 2024 18:09:16 +1000 Subject: [PATCH] Unmute Azure 3rd party tests (#108336) Unmute Azure 3rd party tests (again) after re-generating credentials following the updated guide. Relates: #107928 Fixes: #107720 Fixes: #107502 (cherry picked from commit eba6a848dfde0332dec29278dc5b383062253cd1) # Conflicts: # modules/repository-azure/src/internalClusterTest/java/org/elasticsearch/repositories/azure/AzureStorageCleanupThirdPartyTests.java # x-pack/plugin/snapshot-repo-test-kit/qa/azure/src/javaRestTest/java/org/elasticsearch/repositories/blobstore/testkit/AzureSnapshotRepoTestKitIT.java --- .../azure/AzureStorageCleanupThirdPartyTests.java | 5 ----- .../blobstore/testkit/AzureSnapshotRepoTestKitIT.java | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/repository-azure/src/internalClusterTest/java/org/elasticsearch/repositories/azure/AzureStorageCleanupThirdPartyTests.java b/modules/repository-azure/src/internalClusterTest/java/org/elasticsearch/repositories/azure/AzureStorageCleanupThirdPartyTests.java index 6bc1c78176fdf..785e475b3ba6d 100644 --- a/modules/repository-azure/src/internalClusterTest/java/org/elasticsearch/repositories/azure/AzureStorageCleanupThirdPartyTests.java +++ b/modules/repository-azure/src/internalClusterTest/java/org/elasticsearch/repositories/azure/AzureStorageCleanupThirdPartyTests.java @@ -50,25 +50,21 @@ public class AzureStorageCleanupThirdPartyTests extends AbstractThirdPartyReposi System.getProperty("test.azure.container") ); - @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/107720") @Override public void testCreateSnapshot() { super.testCreateSnapshot(); } - @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/107720") @Override public void testIndexLatest() throws Exception { super.testIndexLatest(); } - @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/107720") @Override public void testListChildren() { super.testListChildren(); } - @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/107720") @Override public void testCleanup() throws Exception { super.testCleanup(); @@ -156,7 +152,6 @@ private void ensureSasTokenPermissions() { future.actionGet(); } - @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/107720") public void testMultiBlockUpload() throws Exception { final BlobStoreRepository repo = getRepository(); // The configured threshold for this test suite is 1mb diff --git a/x-pack/plugin/snapshot-repo-test-kit/qa/azure/src/javaRestTest/java/org/elasticsearch/repositories/blobstore/testkit/AzureSnapshotRepoTestKitIT.java b/x-pack/plugin/snapshot-repo-test-kit/qa/azure/src/javaRestTest/java/org/elasticsearch/repositories/blobstore/testkit/AzureSnapshotRepoTestKitIT.java index bae37bd43b32b..31c9639facd93 100644 --- a/x-pack/plugin/snapshot-repo-test-kit/qa/azure/src/javaRestTest/java/org/elasticsearch/repositories/blobstore/testkit/AzureSnapshotRepoTestKitIT.java +++ b/x-pack/plugin/snapshot-repo-test-kit/qa/azure/src/javaRestTest/java/org/elasticsearch/repositories/blobstore/testkit/AzureSnapshotRepoTestKitIT.java @@ -77,4 +77,9 @@ protected Settings repositorySettings() { return Settings.builder().put("client", "repository_test_kit").put("container", container).put("base_path", basePath).build(); } + + @Override + public void testRepositoryAnalysis() throws Exception { + super.testRepositoryAnalysis(); + } }