Fix flaky tests (#667)

Signed-off-by: Valentin Delaye <jonesbusy@users.noreply.github.com>

Author: jonesbusy

pom.xml

@@ -71,6 +71,7 @@
     <mockito.version>5.23.0</mockito.version>
     <system.stubs.version>2.1.8</system.stubs.version>
     <classgraph.version>4.8.184</classgraph.version>
+    <awaitability.version>4.3.0</awaitability.version>
 
     <!-- Plugin version -->
     <palantir.java.format.version>2.74.0</palantir.java.format.version>
@@ -149,6 +150,11 @@
         <artifactId>commons-compress</artifactId>
         <version>${apache.common-compress.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.awaitility</groupId>
+        <artifactId>awaitility</artifactId>
+        <version>${awaitability.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.bouncycastle</groupId>
         <artifactId>bcprov-jdk18on</artifactId>
@@ -251,6 +257,11 @@
       <artifactId>classgraph</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.awaitility</groupId>
+      <artifactId>awaitility</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-api</artifactId>

src/test/java/land/oras/RegistryTest.java

@@ -284,6 +284,7 @@ void shouldCheckIfCanMount() throws IOException {
     }
 
     @Test
+    @Execution(ExecutionMode.SAME_THREAD)
     void shouldMountWithInsecureRegistry(@TempDir Path homeDir) throws Exception {
 
         // language=toml

src/test/java/land/oras/auth/TokenCacheTest.java

@@ -20,13 +20,14 @@
 
 package land.oras.auth;
 
+import static org.awaitility.Awaitility.await;
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import io.micrometer.core.instrument.FunctionCounter;
 import io.micrometer.core.instrument.MeterRegistry;
 import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
+import java.util.concurrent.TimeUnit;
 import land.oras.ContainerRef;
 import land.oras.TestUtils;
 import org.junit.jupiter.api.BeforeAll;
@@ -80,16 +81,13 @@ void shouldAddAndRetrieveTokenThenExpiredIt() throws InterruptedException {
         Scopes scopes = Scopes.of(containerRef, Scope.PULL).withService("dockerhub"); // Pull only
         TokenCache.put(scopes, tokenResponse);
         assertEquals(tokenResponse, TokenCache.get(scopes), "Should retrieve the token before expiration");
-        Thread.sleep(3000); // Wait for the token to expire
-        assertNull(TokenCache.get(scopes), "Should return null after token expiration");
+        await().atMost(10, TimeUnit.SECONDS)
+                .until(() -> TokenCache.get(scopes) == null
+                        && meterRegistry.find("cache.evictions").functionCounters().stream()
+                                        .mapToDouble(FunctionCounter::count)
+                                        .sum()
+                                >= 1);
         TestUtils.dumpMetrics(meterRegistry);
-        // At least one eviction
-        assertTrue(
-                meterRegistry.find("cache.evictions").functionCounters().stream()
-                                .mapToDouble(FunctionCounter::count)
-                                .sum()
-                        >= 1,
-                "Should have at least one eviction");
     }
 
     @Test