Fixing test failures

Author: cowwoc

.github/workflows/reusable-build.yml

@@ -15,7 +15,8 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        runtime: [ linux-x64, linux-aarch64, osx-x64, win-x64 ]
+        # WORKAROUND: https://github.com/docker/setup-docker-action/issues/166
+        runtime: [ linux-x64, linux-aarch64, osx-x64 ] #, win-x64 ]
         include:
           - runtime: linux-x64
             os: ubuntu-latest
@@ -26,8 +27,8 @@ jobs:
           - runtime: osx-x64
             os: macOS-latest
 
-          - runtime: win-x64
-            os: windows-latest
+    #          - runtime: win-x64
+    #            os: windows-latest
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout source code
@@ -41,9 +42,9 @@ jobs:
           distribution: temurin
           java-version: 24
 
-      - name: Set up WSL
-        if: ${{ matrix.os == 'windows-latest' }}
-        uses: Vampire/setup-wsl@v5
+      #      - name: Set up WSL
+      #        if: ${{ matrix.os == 'windows-latest' }}
+      #        uses: Vampire/setup-wsl@v5
 
       - name: Set up Docker
         uses: docker/setup-docker-action@v4
@@ -55,9 +56,6 @@ jobs:
               }
             }
 
-      - name: Docker version
-        run: docker version
-
       # Pull the images used by integration tests
       - name: Pull docker:dind
         run: docker pull docker:dind

buildx/src/test/java/io/github/cowwoc/anchor4j/buildx/test/resource/ImageIT.java

@@ -10,11 +10,13 @@
 import io.github.cowwoc.anchor4j.core.resource.CoreImageBuilder;
 import io.github.cowwoc.anchor4j.core.resource.CoreImageBuilder.Exporter;
 import io.github.cowwoc.anchor4j.core.resource.DefaultBuildListener;
+import io.github.cowwoc.anchor4j.core.resource.WaitFor;
 import io.github.cowwoc.anchor4j.core.test.TestBuildListener;
 import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
 import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
 import org.testng.annotations.Test;
 
+import java.io.BufferedReader;
 import java.io.EOFException;
 import java.io.File;
 import java.io.FileInputStream;
@@ -200,6 +202,13 @@ public void buildWithCacheFrom() throws IOException, InterruptedException
 		AtomicBoolean cacheWasUsed = new AtomicBoolean(false);
 		client.buildImage().cacheFrom(image.getId()).listener(new DefaultBuildListener()
 		{
+			@Override
+			public void buildStarted(BufferedReader stdoutReader, BufferedReader stderrReader, WaitFor waitFor)
+			{
+				cacheWasUsed.set(false);
+				super.buildStarted(stdoutReader, stderrReader, waitFor);
+			}
+
 			@Override
 			public void onStderrLine(String line)
 			{

core/src/main/java/io/github/cowwoc/anchor4j/core/client/Client.java

@@ -74,15 +74,16 @@ public interface Client
 	/**
 	 * Blocks until the default builder is reachable and has a {@code RUNNING} state.
 	 *
-	 * @param until the latest time to attempt to poll the builder's state
+	 * @param deadline the absolute time by which the builder must be ready. The method will poll the builder's
+	 *                 state while the current time is before this value.
 	 * @return the builder
 	 * @throws IOException          if an I/O error occurs. These errors are typically transient, and retrying
 	 *                              the request may resolve the issue.
 	 * @throws InterruptedException if the thread is interrupted before the operation completes. This can happen
 	 *                              due to shutdown signals.
-	 * @throws TimeoutException     if a timeout occurs before the operation completes
+	 * @throws TimeoutException     if the deadline expires before the operation succeeds
 	 */
-	BuilderState waitUntilBuilderIsReady(Instant until)
+	BuilderState waitUntilBuilderIsReady(Instant deadline)
 		throws IOException, InterruptedException, TimeoutException;
 
 	/**

core/src/main/java/io/github/cowwoc/anchor4j/core/internal/client/AbstractInternalClient.java

@@ -50,6 +50,7 @@
 public abstract class AbstractInternalClient implements InternalClient
 {
 	private final static ByteBuffer EMPTY_BYTE_BUFFER = ByteBuffer.allocate(0);
+	private final static Duration SLEEP_DURATION = Duration.ofMillis(100);
 	/**
 	 * The path of the command-line executable.
 	 */
@@ -102,17 +103,25 @@ public Duration getRetryTimeout()
 	@Override
 	public <V> V retry(Operation<V> operation) throws IOException, InterruptedException
 	{
-		return retry(operation, Instant.now().plus(getRetryTimeout()));
+		try
+		{
+			return retry(operation, Instant.now().plus(getRetryTimeout()));
+		}
+		catch (TimeoutException e)
+		{
+			throw new AssertionError("An operation without a timeout threw a TimeoutException", e);
+		}
 	}
 
 	@Override
-	public <V> V retry(Operation<V> operation, Instant until) throws IOException, InterruptedException
+	public <V> V retry(Operation<V> operation, Instant deadline)
+		throws IOException, InterruptedException, TimeoutException
 	{
 		while (true)
 		{
 			try
 			{
-				return operation.run(until);
+				return operation.run(deadline);
 			}
 			catch (FileNotFoundException e)
 			{
@@ -122,46 +131,68 @@ public <V> V retry(Operation<V> operation, Instant until) throws IOException, In
 			catch (IOException e)
 			{
 				// WORKAROUND: https://github.com/moby/moby/issues/50160
-				if (timeoutOccurred(until, e))
+				if (!sleepBeforeRetry(deadline, e))
 					throw e;
 			}
 			catch (UnsupportedExporterException e)
 			{
 				// Surprisingly, the following error occurs intermittently under load:
 				//
 				// ERROR: failed to build: docker exporter does not currently support exporting manifest lists
-				if (timeoutOccurred(until, e))
+				if (!sleepBeforeRetry(deadline, e))
 					throw e;
 			}
 		}
 	}
 
 	/**
-	 * @param until the latest time to attempt to run the command. The method will retry failed operations while
-	 *              the current time is before this value.
-	 * @param t     the exception that was thrown
+	 * Checks if a timeout occurred.
+	 *
+	 * @param deadline the absolute time by which the operation must succeed. The method will retry failed
+	 *                 operations while the current time is before this value.
+	 * @param t        the exception that was thrown
 	 * @return {@code true} if the operation may be retried
 	 * @throws InterruptedException if the thread is interrupted before the operation completes. This can happen
 	 *                              due to shutdown signals.
 	 */
-	private boolean timeoutOccurred(Instant until, Throwable t) throws InterruptedException
+	@SuppressWarnings("BooleanMethodIsAlwaysInverted")
+	private boolean sleepBeforeRetry(Instant deadline, Throwable t) throws InterruptedException
 	{
-		Instant now = Instant.now();
-		if (now.isAfter(until))
-			return true;
-		Thread.sleep(100);
+		Instant nextRetry = Instant.now().plus(SLEEP_DURATION);
+		if (nextRetry.isAfter(deadline))
+			return false;
+		Thread.sleep(SLEEP_DURATION);
 		log.debug("Retrying after sleep", t);
-		return false;
+		return true;
+	}
+
+	/**
+	 * Checks if a timeout occurred.
+	 *
+	 * @param deadline the absolute time by which the operation must succeed. The method will retry failed
+	 *                 operations while the current time is before this value.
+	 * @return {@code true} if the operation may be retried
+	 * @throws InterruptedException if the thread is interrupted before the operation completes. This can happen
+	 *                              due to shutdown signals.
+	 */
+	protected boolean sleepBeforeRetry(Instant deadline) throws InterruptedException
+	{
+		Instant nextRetry = Instant.now().plus(SLEEP_DURATION);
+		if (nextRetry.isAfter(deadline))
+			return false;
+		Thread.sleep(SLEEP_DURATION);
+		log.debug("Retrying after sleep");
+		return true;
 	}
 
 	@Override
-	public CommandResult run(List<String> arguments, Instant until) throws IOException, InterruptedException
+	public CommandResult run(List<String> arguments, Instant deadline) throws IOException, InterruptedException
 	{
-		return run(arguments, EMPTY_BYTE_BUFFER, until);
+		return run(arguments, EMPTY_BYTE_BUFFER, deadline);
 	}
 
 	@Override
-	public CommandResult run(List<String> arguments, ByteBuffer stdin, Instant until)
+	public CommandResult run(List<String> arguments, ByteBuffer stdin, Instant deadline)
 		throws IOException, InterruptedException
 	{
 		ProcessBuilder processBuilder = getProcessBuilder(arguments);
@@ -304,7 +335,7 @@ public BuilderState getBuilderState(String name) throws IOException, Interrupted
 
 	@Override
 	@SuppressWarnings("BusyWait")
-	public BuilderState waitUntilBuilderIsReady(Instant until)
+	public BuilderState waitUntilBuilderIsReady(Instant deadline)
 		throws IOException, InterruptedException, TimeoutException
 	{
 		while (true)
@@ -316,13 +347,13 @@ public BuilderState waitUntilBuilderIsReady(Instant until)
 			if (builder == null)
 			{
 				log.debug("builder == null");
-				if (now.isAfter(until))
+				if (now.isAfter(deadline))
 					throw new TimeoutException("Default builder not found");
 			}
 			else
 			{
 				log.debug("builder.status: {}", builder.getStatus());
-				if (now.isAfter(until))
+				if (now.isAfter(deadline))
 				{
 					StringBuilder message = new StringBuilder(
 						"Default builder " + builder.getName() + " has a state of " +

core/src/main/java/io/github/cowwoc/anchor4j/core/internal/client/InternalClient.java

@@ -10,6 +10,7 @@
 import java.time.Duration;
 import java.time.Instant;
 import java.util.List;
+import java.util.concurrent.TimeoutException;
 
 /**
  * The internals shared by all clients.
@@ -35,28 +36,28 @@ public interface InternalClient extends Client
 	 * Runs a command and returns its output.
 	 *
 	 * @param arguments the command-line arguments to pass to the executable
-	 * @param until     the latest time to attempt to run the command. The method will retry failed operations
-	 *                  while the current time is before this value.
+	 * @param deadline  the absolute time by which the operation must succeed. The method will retry failed
+	 *                  operations while the current time is before this value.
 	 * @return the output of the command
 	 * @throws NullPointerException if any of the arguments are null
 	 * @throws IOException          if the executable could not be found
 	 * @throws InterruptedException if the thread was interrupted before the operation completed
 	 */
-	CommandResult run(List<String> arguments, Instant until) throws IOException, InterruptedException;
+	CommandResult run(List<String> arguments, Instant deadline) throws IOException, InterruptedException;
 
 	/**
 	 * Runs a command and returns its output.
 	 *
 	 * @param arguments the command-line arguments to pass to the executable
 	 * @param stdin     the bytes to pass into the command's stdin stream
-	 * @param until     the latest time to attempt to run the command. The method will retry failed operations
-	 *                  while the current time is before this value.
+	 * @param deadline  the absolute time by which the operation must succeed. The method will retry failed
+	 *                  operations while the current time is before this value.
 	 * @return the output of the command
 	 * @throws NullPointerException if any of the arguments are null
 	 * @throws IOException          if the executable could not be found
 	 * @throws InterruptedException if the thread was interrupted before the operation completed
 	 */
-	CommandResult run(List<String> arguments, ByteBuffer stdin, Instant until)
+	CommandResult run(List<String> arguments, ByteBuffer stdin, Instant deadline)
 		throws IOException, InterruptedException;
 
 	/**
@@ -90,14 +91,17 @@ CommandResult run(List<String> arguments, ByteBuffer stdin, Instant until)
 	 *
 	 * @param <V>       the type of value returned by the operation
 	 * @param operation the operation
-	 * @param until     the latest time to attempt to run the command. The method will retry failed operations
-	 *                  while the current time is before this value.
+	 * @param deadline  the absolute time by which the operation must succeed. The method will retry failed
+	 *                  operations while the current time is before this value.
 	 * @return the value returned by the operation
-	 * @throws IOException          if an I/O error persists beyond the {@code deadline}
+	 * @throws IOException          if an I/O error persists beyond the {@code until}
 	 * @throws InterruptedException if the thread is interrupted before the operation completes. This can happen
 	 *                              due to shutdown signals.
+	 * @throws TimeoutException     if the deadline expires before the operation completes successfully, and no
+	 *                              other exception was thrown to indicate the failure
 	 */
-	<V> V retry(Operation<V> operation, Instant until) throws IOException, InterruptedException;
+	<V> V retry(Operation<V> operation, Instant deadline)
+		throws IOException, InterruptedException, TimeoutException;
 
 	/**
 	 * @return a {@code BuildXParser}

core/src/main/java/io/github/cowwoc/anchor4j/core/internal/client/Operation.java

@@ -2,6 +2,7 @@
 
 import java.io.IOException;
 import java.time.Instant;
+import java.util.concurrent.TimeoutException;
 
 /**
  * Represents an operation that may fail due to intermittent I/O errors.
@@ -13,14 +14,16 @@ public interface Operation<V>
 	/**
 	 * Runs the operation.
 	 *
-	 * @param until the latest time to attempt to run the command. The method will retry failed operations while
-	 *              the current time is before this value.
+	 * @param deadline the absolute time by which the operation must succeed. The method will retry failed
+	 *                 operations while the current time is before this value.
 	 * @return the value returned by the operation
-	 * @throws NullPointerException if {@code deadline} is null
+	 * @throws NullPointerException if {@code until} is null
 	 * @throws IOException          if an I/O error occurs. These errors are typically transient, and retrying
 	 *                              the request may resolve the issue.
 	 * @throws InterruptedException if the thread is interrupted before the operation completes. This can happen
 	 *                              due to shutdown signals.
+	 * @throws TimeoutException     if the deadline expires before the operation succeeds, and no other
+	 *                              exception was thrown to indicate the failure
 	 */
-	V run(Instant until) throws InterruptedException, IOException;
+	V run(Instant deadline) throws InterruptedException, IOException, TimeoutException;
 }

core/src/main/java/io/github/cowwoc/anchor4j/core/resource/DefaultBuildListener.java

@@ -12,6 +12,7 @@
 import java.io.BufferedReader;
 import java.io.FileNotFoundException;
 import java.io.IOException;
+import java.util.List;
 import java.util.StringJoiner;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingQueue;
@@ -27,9 +28,12 @@ public class DefaultBuildListener implements BuildListener
 	private static final Pattern ERROR_READING_PREFACE = Pattern.compile(".+? .+? http2: server: " +
 		"error reading preface from client .+?: file has already been closed\n");
 	// Known variants:
-	// ERROR: failed to build: resolve : (?:CreateFile|lstat) (.+?): The system cannot find the file specified.
-	private static final Pattern FILE_NOT_FOUND = Pattern.compile("ERROR: failed to build: resolve : " +
-		"(?:CreateFile|lstat) (.+?): The system cannot find the file specified\\.");
+	// ERROR: failed to build: resolve : CreateFile C:\Users\Gili\Documents\anchor4j\buildx\src\test\resources\missing: The system cannot find the file specified.
+	// ERROR: resolve : lstat /home/runner/work/anchor4j/anchor4j/buildx/src/test/resources/missing: no such file or directory
+	// ERROR: failed to build: resolve : lstat /home/runner/work/anchor4j/anchor4j/buildx/src/test/resources/missing: no such file or directory
+	private static final List<Pattern> FILE_NOT_FOUND = List.of(Pattern.compile("ERROR: (?:.*?: )?" +
+			"resolve : CreateFile (.+?): The system cannot find the file specified\\."),
+		Pattern.compile("ERROR: (?:.*?: )?resolve : lstat (.+?): no such file or directory"));
 	private static final String DOCKER_DRIVER_DOES_NOT_SUPPORT_MANIFEST_LIST =
 		"ERROR: failed to build: docker exporter does not currently support exporting manifest lists";
 	private static final String DOCKER_DRIVER_DOES_NOT_SUPPORT_OCI =
@@ -42,7 +46,7 @@ public class DefaultBuildListener implements BuildListener
 	private static final Pattern RESOURCE_IN_USE = Pattern.compile("""
 		ERROR: failed to build: no valid drivers found: open (.+?): The process cannot access the file because \
 		it is being used by another process\\.""");
-	
+
 	/**
 	 * The lines returned by the build's standard output stream.
 	 */
@@ -163,9 +167,12 @@ public void buildFailed(CommandResult result) throws IOException
 			// "2025/06/11 15:53:20 http2: server: error reading preface from client //./pipe/dockerDesktopLinuxEngine: file has already been closed"
 			stderr = stderr.substring(matcher.end());
 		}
-		matcher = FILE_NOT_FOUND.matcher(stderr);
-		if (matcher.matches())
-			throw new FileNotFoundException(matcher.group(1));
+		for (Pattern pattern : FILE_NOT_FOUND)
+		{
+			matcher = pattern.matcher(stderr);
+			if (matcher.matches())
+				throw new FileNotFoundException(matcher.group(1));
+		}
 		matcher = BuildXParser.NOT_FOUND.matcher(stderr);
 		if (matcher.matches())
 			throw new BuilderNotFoundException(matcher.group(1));