HADOOP-19610. S3A: ITests to run under JUnit5: many more tests

* parameterize remaining ones
* Rename Flaky to FlakyTest, same for @scaletest
* new @loadtest tag
* audit all subclasses of setup/teardown for @BeforeEach/@AfterEach

Author: steveloughran

hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/contract/AbstractContractMultipartUploaderTest.java

@@ -30,6 +30,7 @@
 import java.util.concurrent.CompletableFuture;
 
 import org.assertj.core.api.Assertions;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
@@ -99,6 +100,7 @@ public void setup() throws Exception {
   }
 
   @Override
+  @AfterEach
   public void teardown() throws Exception {
     MultipartUploader uploader = getUploader(1);
     if (uploader != null) {

hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/contract/AbstractContractUnbufferTest.java

@@ -26,7 +26,7 @@
 
 import org.apache.hadoop.fs.FSDataInputStream;
 import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.test.tags.Flaky;
+import org.apache.hadoop.test.tags.FlakyTest;
 
 import static org.apache.hadoop.fs.contract.ContractTestUtils.createFile;
 import static org.apache.hadoop.fs.contract.ContractTestUtils.dataset;
@@ -50,7 +50,7 @@ public void setup() throws Exception {
   }
 
   @Test
-  @Flaky("buffer underflow")
+  @FlakyTest("buffer underflow")
   public void testUnbufferAfterRead() throws IOException {
     describe("unbuffer a file after a single read");
     try (FSDataInputStream stream = getFileSystem().open(file)) {
@@ -60,7 +60,7 @@ public void testUnbufferAfterRead() throws IOException {
   }
 
   @Test
-  @Flaky("buffer underflow")
+  @FlakyTest("buffer underflow")
   public void testUnbufferBeforeRead() throws IOException {
     describe("unbuffer a file before a read");
     try (FSDataInputStream stream = getFileSystem().open(file)) {
@@ -80,7 +80,7 @@ public void testUnbufferEmptyFile() throws IOException {
   }
 
   @Test
-  @Flaky("buffer underflow")
+  @FlakyTest("buffer underflow")
   public void testUnbufferOnClosedFile() throws IOException {
     describe("unbuffer a file before a read");
     FSDataInputStream stream = null;
@@ -98,7 +98,7 @@ public void testUnbufferOnClosedFile() throws IOException {
   }
 
   @Test
-  @Flaky("buffer underflow")
+  @FlakyTest("buffer underflow")
   public void testMultipleUnbuffers() throws IOException {
     describe("unbuffer a file multiple times");
     try (FSDataInputStream stream = getFileSystem().open(file)) {
@@ -110,7 +110,7 @@ public void testMultipleUnbuffers() throws IOException {
     }
   }
 
-  @Flaky("buffer underflow")
+  @FlakyTest("buffer underflow")
   @Test
   public void testUnbufferMultipleReads() throws IOException {
     describe("unbuffer a file multiple times");

hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/tags/Flaky.java renamed to hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/tags/FlakyTest.java

@@ -37,7 +37,7 @@
  */
 @Target({ElementType.METHOD, ElementType.TYPE})
 @Retention(RetentionPolicy.RUNTIME)
-@Tag("Flaky")
-public @interface Flaky {
+@Tag("flaky")
+public @interface FlakyTest {
   String value();
 }

hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/tags/LoadTest.java

@@ -0,0 +1,42 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hadoop.test.tags;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import org.junit.jupiter.api.Tag;
+
+/**
+ * JUnit 5 tag to indicate that a test suite is a load test suite, which is
+ * designed to load/overload the target system.
+ * <p> If this test is directed at cloud infrastructure the load may be significant
+ * enough to trigger throttling, which may be observed not only by othere tests, but
+ * by other users/applications using the same account.
+ * <p> The test runner tag to filter on is {@code load}.
+ * <p> Note: this annotation should be accompanied by the {@link ScaleTest}
+ * tag to indicate it is a specific type of scale test.
+ */
+@Target({ElementType.METHOD, ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+@Tag("load")
+public @interface LoadTest {
+}

hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/tags/Scale.java renamed to hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/tags/ScaleTest.java

@@ -33,5 +33,5 @@
 @Target({ElementType.METHOD, ElementType.TYPE})
 @Retention(RetentionPolicy.RUNTIME)
 @Tag("scale")
-public @interface Scale {
+public @interface ScaleTest {
 }

hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/tags/package-info.java

@@ -18,10 +18,10 @@
 
 @org.apache.hadoop.classification.InterfaceStability.Unstable
 @org.apache.hadoop.classification.InterfaceAudience.LimitedPrivate("test exenders")
-package org.apache.hadoop.test.tags;
 /**
  * JUnit 5 tags.
  * <p>
  * For use in Hadoop's own test suites, and those which extend them, such as FileSystem contract
  * tests.
- */
+ */
+package org.apache.hadoop.test.tags;

hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/contract/s3a/ITestS3AContractAnalyticsStreamVectoredRead.java

@@ -21,7 +21,6 @@
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.contract.AbstractContractVectoredReadTest;
 import org.apache.hadoop.fs.contract.AbstractFSContract;
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.params.ParameterizedClass;
 import org.junit.jupiter.params.provider.MethodSource;
 

hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/contract/s3a/ITestS3AContractMultipartUploader.java

@@ -22,6 +22,8 @@
 import org.apache.hadoop.fs.contract.AbstractContractMultipartUploaderTest;
 import org.apache.hadoop.fs.contract.AbstractFSContract;
 import org.apache.hadoop.fs.s3a.S3AFileSystem;
+import org.apache.hadoop.test.tags.ScaleTest;
+
 import org.junit.jupiter.api.BeforeEach;
 
 import static org.apache.hadoop.fs.contract.ContractTestUtils.skip;
@@ -43,6 +45,7 @@
  * to enable it, and partition size option to control the size of
  * parts uploaded.
  */
+@ScaleTest
 public class ITestS3AContractMultipartUploader extends
     AbstractContractMultipartUploaderTest {
 

hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/contract/s3a/ITestS3AContractSeek.java

@@ -223,7 +223,7 @@ public void testReadPolicyInFS() throws Throwable {
    * in random IO mode, a subsequent GET.
    */
 
-   @Test
+  @Test
   public void testReadAcrossReadahead() throws Throwable {
     describe("Sets up a read which will span the active readahead"
         + " and the rest of the file.");
@@ -254,7 +254,7 @@ public void testReadAcrossReadahead() throws Throwable {
    * which will read a single byte only.
    */
 
-   @Test
+  @Test
   public void testReadSingleByteAcrossReadahead() throws Throwable {
     describe("Read over boundary using read()/readByte() calls.");
     Path path = path("testReadSingleByteAcrossReadahead");
@@ -276,7 +276,7 @@ public void testReadSingleByteAcrossReadahead() throws Throwable {
   }
 
 
-   @Test
+  @Test
   public void testSeekToReadaheadAndRead() throws Throwable {
     describe("Seek to just before readahead limit and call"
         + " InputStream.read(byte[])");
@@ -320,7 +320,7 @@ public void testSeekToReadaheadExactlyAndRead() throws Throwable {
   }
 
 
-   @Test
+  @Test
   public void testSeekToReadaheadExactlyAndReadByte() throws Throwable {
     describe("Seek to exactly the readahead limit and call"
         + " readByte()");

hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/ITestS3AClientSideEncryption.java

@@ -46,6 +46,7 @@
 import org.apache.hadoop.fs.statistics.IOStatisticAssertions;
 import org.apache.hadoop.fs.statistics.IOStatistics;
 import org.apache.hadoop.fs.store.audit.AuditSpan;
+import org.apache.hadoop.test.tags.ScaleTest;
 
 import static org.apache.hadoop.fs.contract.ContractTestUtils.createFile;
 import static org.apache.hadoop.fs.contract.ContractTestUtils.dataset;
@@ -160,6 +161,7 @@ public void testDirectoryListingFileLengths() throws IOException {
    * verifying the contents of the uploaded file.
    */
   @Test
+  @ScaleTest
   public void testBigFilePutAndGet() throws IOException {
     maybeSkipTest();
     assume("Scale test disabled: to enable set property " +