Reinstate integ tests base class and mute failing suite

Author: DaveCTurner

modules/repository-s3/src/internalClusterTest/java/org/elasticsearch/repositories/s3/S3BlobStoreRepositoryMetricsTests.java

@@ -12,6 +12,7 @@
 import com.sun.net.httpserver.HttpExchange;
 import com.sun.net.httpserver.HttpHandler;
 
+import org.apache.lucene.tests.util.LuceneTestCase;
 import org.elasticsearch.cluster.node.DiscoveryNode;
 import org.elasticsearch.common.blobstore.BlobContainer;
 import org.elasticsearch.common.blobstore.BlobPath;
@@ -68,6 +69,7 @@
 @SuppressForbidden(reason = "this test uses a HttpServer to emulate an S3 endpoint")
 // Need to set up a new cluster for each test because cluster settings use randomized authentication settings
 @ESIntegTestCase.ClusterScope(scope = ESIntegTestCase.Scope.TEST)
+@LuceneTestCase.AwaitsFix(bugUrl = "TODO NOMERGE")
 public class S3BlobStoreRepositoryMetricsTests extends S3BlobStoreRepositoryTests {
 
     private static final S3ErrorResponse S3_SLOW_DOWN_RESPONSE = new S3ErrorResponse(SERVICE_UNAVAILABLE, """

test/framework/src/main/java/org/elasticsearch/repositories/blobstore/ESBlobStoreRepositoryIntegTestCase.java

@@ -9,7 +9,6 @@
 package org.elasticsearch.repositories.blobstore;
 
 import org.apache.lucene.tests.mockfile.ExtrasFS;
-import org.apache.lucene.tests.util.LuceneTestCase;
 import org.apache.lucene.util.BytesRef;
 import org.apache.lucene.util.BytesRefBuilder;
 import org.apache.lucene.util.SetOnce;
@@ -78,7 +77,6 @@
 /**
  * Integration tests for {@link BlobStoreRepository} implementations.
  */
-@LuceneTestCase.AwaitsFix(bugUrl = "TODO NOMERGE")
 public abstract class ESBlobStoreRepositoryIntegTestCase extends ESIntegTestCase {
 
     public static RepositoryData getRepositoryData(Repository repository) {