Switched some integration test Thread.sleep implementations to use the new waiter. No longer run checkstyle, findbugs or unit tests when using the integration test profile.

Author: millems

pom.xml

@@ -549,6 +549,11 @@
                     <name>doRelease</name>
                 </property>
             </activation>
+            <properties>
+                <checkstyle.skip>true</checkstyle.skip>
+                <findbugs.skip>true</findbugs.skip>
+                <skip.unit.tests>true</skip.unit.tests>
+            </properties>
             <build>
                 <plugins>
                     <plugin>

services/cloudformation/src/it/java/software/amazon/awssdk/services/cloudformation/StackIntegrationTests.java

@@ -21,6 +21,7 @@
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
+import java.time.Duration;
 import java.util.Iterator;
 import java.util.List;
 import org.junit.AfterClass;
@@ -66,6 +67,7 @@
 import software.amazon.awssdk.services.cloudformation.model.StackSummary;
 import software.amazon.awssdk.services.cloudformation.model.UpdateStackRequest;
 import software.amazon.awssdk.services.cloudformation.model.UpdateStackResponse;
+import software.amazon.awssdk.testutils.Waiter;
 
 /**
  * Tests of the Stack APIs : CloudFormation
@@ -392,27 +394,9 @@ public void testAlreadyExistsException() {
      *            the test stack has a status other than this.
      */
     private void waitForStackToChangeStatus(StackStatus oldStatus) throws Exception {
-        long startTime = System.currentTimeMillis();
-        long timeoutInMinutes = 35;
-        while (true) {
-            List<Stack> stacks = cf.describeStacks(DescribeStacksRequest.builder().stackName(testStackName).build())
-                                   .stacks();
-            assertEquals(1, stacks.size());
-
-            if (!stacks.get(0).stackStatusString().equalsIgnoreCase(oldStatus.toString())) {
-                return;
-            }
-
-            System.out.println("Waiting for stack to change out of status " + oldStatus.toString()
-                               + " (current status: " + stacks.get(0).stackStatus() + ")");
-
-            if ((System.currentTimeMillis() - startTime) > (timeoutInMinutes * 1000 * 60)) {
-                throw new RuntimeException("Waited " + timeoutInMinutes
-                                           + " minutes, but stack never changed status from " + oldStatus.toString());
-            }
-
-            Thread.sleep(1000 * 120);
-        }
+        Waiter.run(() -> cf.describeStacks(d -> d.stackName(testStackName)))
+              .until(r -> r.stacks().size() == 1 && r.stacks().get(0).stackStatus() != oldStatus)
+              .orFailAfter(Duration.ofMinutes(2));
     }
 
     /**

services/cloudwatch/src/it/java/software/amazon/awssdk/services/cloudwatch/CloudWatchIntegrationTest.java

@@ -34,6 +34,7 @@
 import software.amazon.awssdk.core.AmazonServiceException;
 import software.amazon.awssdk.core.SdkGlobalTime;
 import software.amazon.awssdk.core.auth.StaticCredentialsProvider;
+import software.amazon.awssdk.core.regions.Region;
 import software.amazon.awssdk.services.cloudwatch.model.Datapoint;
 import software.amazon.awssdk.services.cloudwatch.model.DeleteAlarmsRequest;
 import software.amazon.awssdk.services.cloudwatch.model.DescribeAlarmHistoryRequest;
@@ -56,6 +57,7 @@
 import software.amazon.awssdk.services.cloudwatch.model.PutMetricAlarmRequest;
 import software.amazon.awssdk.services.cloudwatch.model.PutMetricDataRequest;
 import software.amazon.awssdk.services.cloudwatch.model.SetAlarmStateRequest;
+import software.amazon.awssdk.testutils.Waiter;
 import software.amazon.awssdk.testutils.service.AwsIntegrationTestBase;
 import software.amazon.awssdk.testutils.SdkAsserts;
 
@@ -75,7 +77,10 @@ public class CloudWatchIntegrationTest extends AwsIntegrationTestBase {
      */
     @BeforeClass
     public static void setUp() throws IOException {
-        cloudwatch = CloudWatchClient.builder().credentialsProvider(StaticCredentialsProvider.create(getCredentials())).build();
+        cloudwatch = CloudWatchClient.builder()
+                                     .credentialsProvider(getCredentialsProvider())
+                                     .region(Region.US_WEST_2)
+                                     .build();
     }
 
     /**
@@ -116,20 +121,17 @@ public void put_get_metricdata_list_metric_returns_success() throws
         cloudwatch.putMetricData(PutMetricDataRequest.builder()
                                          .namespace("AWS.EC2").metricData(datum).build());
 
-        // TODO: get an ETA on the arrival of this data
-        Thread.sleep(60 * 1000);
-
-        GetMetricStatisticsRequest getRequest = GetMetricStatisticsRequest.builder()
-                .startTime(Instant.now().minus(Duration.ofDays(7)))
-                .namespace("AWS.EC2")
-                .period(60 * 60)
-                .dimensions(Dimension.builder().name("InstanceType").value("m1.small").build())
-                .metricName(measureName)
-                .statistics("Average", "Maximum", "Minimum", "Sum")
-                .endTime(Instant.now())
-                .build();
-        GetMetricStatisticsResponse result = cloudwatch
-                .getMetricStatistics(getRequest);
+        GetMetricStatisticsResponse result =
+                Waiter.run(() -> cloudwatch.getMetricStatistics(r -> r.startTime(Instant.now().minus(Duration.ofDays(7)))
+                                                                      .namespace("AWS.EC2")
+                                                                      .period(60 * 60)
+                                                                      .dimensions(Dimension.builder().name("InstanceType")
+                                                                                           .value("m1.small").build())
+                                                                      .metricName(measureName)
+                                                                      .statistics("Average", "Maximum", "Minimum", "Sum")
+                                                                      .endTime(Instant.now())))
+                      .until(r -> r.datapoints().size() == 1)
+                      .orFailAfter(Duration.ofMinutes(1));
 
         assertNotNull(result.label());
         assertEquals(measureName, result.label());

services/dynamodb/src/it/java/software/amazon/awssdk/services/dynamodb/DynamoServiceIntegrationTest.java

@@ -280,7 +280,7 @@ public void testServiceOperations() throws Exception {
         assertTrue(itemResult.item().get("BS").bs().contains(ByteBuffer.wrap(generateByteArray(contentLength + 1))));
 
         // Pause to try and deal with ProvisionedThroughputExceededExceptions
-        Thread.sleep(1000 * 20);
+        Thread.sleep(1000 * 5);
 
         // Add some data into the table with binary hash key
         ByteBuffer byteBuffer = ByteBuffer.allocate(contentLength * 2);
@@ -314,7 +314,7 @@ public void testServiceOperations() throws Exception {
         assertTrue(itemResult.item().get("BS").bs().contains(ByteBuffer.wrap(generateByteArray(contentLength + 1))));
 
         // Pause to try and deal with ProvisionedThroughputExceededExceptions
-        Thread.sleep(1000 * 20);
+        Thread.sleep(1000 * 5);
 
         // Load some random data
         System.out.println("Loading data...");

services/dynamodb/src/test/java/utils/resources/TestResourceUtils.java

@@ -15,7 +15,9 @@
 
 package utils.resources;
 
+import java.time.Duration;
 import software.amazon.awssdk.core.AmazonClientException;
+import software.amazon.awssdk.testutils.Waiter;
 import software.amazon.awssdk.utils.Logger;
 import utils.resources.RequiredResources.ResourceCreationPolicy;
 import utils.resources.TestResource.ResourceStatus;
@@ -57,17 +59,8 @@ public static void deleteResource(TestResource resource) throws InterruptedExcep
     }
 
     public static ResourceStatus waitForFinalizedStatus(TestResource resource) throws InterruptedException {
-        long startTime = System.currentTimeMillis();
-        long endTime = startTime + (10 * 60 * 1000);
-        while (System.currentTimeMillis() < endTime) {
-            ResourceStatus status = resource.getResourceStatus();
-            if (status != ResourceStatus.TRANSIENT) {
-                return status;
-            }
-            log.info(() -> "Waiting for " + resource + " to escape the transient state...");
-            Thread.sleep(1000 * 10);
-        }
-
-        throw new AmazonClientException("Resource never escaped the transient state.");
+        return Waiter.run(resource::getResourceStatus)
+                     .until(s -> s != ResourceStatus.TRANSIENT)
+                     .orFailAfter(Duration.ofMinutes(5));
     }
 }