Make tests more resiliant

Author: alextwoods

core/auth/src/test/java/software/amazon/awssdk/auth/credentials/ProfileCredentialsProviderTest.java

@@ -25,6 +25,7 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Optional;
+import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.Supplier;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
@@ -33,6 +34,7 @@
 import software.amazon.awssdk.profiles.ProfileFile;
 import software.amazon.awssdk.profiles.ProfileFileSupplier;
 import software.amazon.awssdk.profiles.ProfileProperty;
+import software.amazon.awssdk.testutils.Waiter;
 import software.amazon.awssdk.utils.StringInputStream;
 
 /**
@@ -244,29 +246,28 @@ void resolveCredentials_presentSupplierProfileFile_returnsCredentials() {
     }
 
     @Test
-    void resolveCredentials_defaultProfileFileSupplier_refreshesCredentials() throws InterruptedException {
-        Path credentialsFile = generateTestCredentialsFile("defaultAccessKey", "defaultSecretAccessKey");
+    void resolveCredentials_defaultProfileFileSupplier_refreshesCredentials() {
+        AtomicBoolean firstCall = new AtomicBoolean(true);
+        ProfileFile file1 = profileFile("[default]\naws_access_key_id = akid1\n"
+                                        + "aws_secret_access_key = sak1\n");
+        ProfileFile file2 = profileFile("[default]\naws_access_key_id = akid2\n"
+                                        + "aws_secret_access_key = sak2\n");
+        Supplier<ProfileFile> refreshingSupplier = () ->  firstCall.getAndSet(false) ? file1 : file2;
 
         ProfileCredentialsProvider provider =  new ProfileCredentialsProvider
             .BuilderImpl()
-            .defaultProfileFileLoader(ProfileFileSupplier.reloadWhenModified(credentialsFile, ProfileFile.Type.CREDENTIALS))
+            .defaultProfileFileLoader(refreshingSupplier)
                                       .profileName("default")
                                       .build();
 
         assertThat(provider.resolveCredentials()).satisfies(credentials -> {
-            assertThat(credentials.accessKeyId()).isEqualTo("defaultAccessKey");
-            assertThat(credentials.secretAccessKey()).isEqualTo("defaultSecretAccessKey");
+            assertThat(credentials.accessKeyId()).isEqualTo("akid1");
+            assertThat(credentials.secretAccessKey()).isEqualTo("sak1");
         });
 
-        // modify the file
-        generateTestCredentialsFile("updatedAccessKey", "updatedSecretAccessKey");
-
-        // ProfileFileRefresher has a stale time of 1000 ms.
-        Thread.sleep(1100);
-
         assertThat(provider.resolveCredentials()).satisfies(credentials -> {
-            assertThat(credentials.accessKeyId()).isEqualTo("updatedAccessKey");
-            assertThat(credentials.secretAccessKey()).isEqualTo("updatedSecretAccessKey");
+            assertThat(credentials.accessKeyId()).isEqualTo("akid2");
+            assertThat(credentials.secretAccessKey()).isEqualTo("sak2");
         });
     }
 

core/sdk-core/src/test/java/software/amazon/awssdk/core/client/builder/DefaultClientBuilderTest.java

@@ -88,6 +88,7 @@
 import software.amazon.awssdk.metrics.MetricPublisher;
 import software.amazon.awssdk.profiles.ProfileFile;
 import software.amazon.awssdk.testutils.EnvironmentVariableHelper;
+import software.amazon.awssdk.testutils.Waiter;
 import software.amazon.awssdk.utils.AttributeMap;
 import software.amazon.awssdk.utils.StringInputStream;
 
@@ -430,21 +431,24 @@ public void defaultProfileFileSupplier_isStaticOrHasIdentityCaching() {
     }
 
     @Test
-    public void defaultProfileFileSupplier_refreshesWhenFileModified() {
+    public void defaultProfileFileSupplier_isRefreshing() {
         EnvironmentVariableHelper.run(env -> {
             try {
                 File credentialFile = tempFolder.newFile();
                 writeTestCredentialsFile(credentialFile, "akid1", "sak");
                 env.set("AWS_SHARED_CREDENTIALS_FILE", credentialFile.getPath());
+                env.set("AWS_CONFIG_FILE", tempFolder.getRoot().toPath().resolve("does-not-exist").toString());
                 SdkClientConfiguration config =
                     testClientBuilder().build().clientConfiguration;
 
                 Supplier<ProfileFile> defaultProfileFileSupplier = config.option(PROFILE_FILE_SUPPLIER);
                 ProfileFile firstGet = defaultProfileFileSupplier.get();
 
                 writeTestCredentialsFile(credentialFile, "updatedAkid", "updatedSak");
-                Thread.sleep(1100);
-                ProfileFile secondGet = defaultProfileFileSupplier.get();
+
+                ProfileFile secondGet = Waiter.run(() -> defaultProfileFileSupplier.get())
+                                              .until((p) -> !p.equals(firstGet))
+                                              .orFailAfter(Duration.ofSeconds(10));
 
                 assertThat(secondGet).isNotSameAs(firstGet);
                 assertThat(secondGet.profile("default")).isPresent();
@@ -456,7 +460,7 @@ public void defaultProfileFileSupplier_refreshesWhenFileModified() {
                 });
 
             }
-            catch (IOException | InterruptedException e) {
+            catch (IOException e) {
                 throw new RuntimeException(e);
             }
         });