From b02c1877fc13b8bfb4385d62ad4ac0eb5405f27a Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 2 Aug 2023 14:58:16 +0100 Subject: [PATCH] Fix configIsReadWithProvidedContext on Windows See gh-36445 --- .../configuration/DockerConfigurationMetadataTests.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/configuration/DockerConfigurationMetadataTests.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/configuration/DockerConfigurationMetadataTests.java index c619eac3161..b47bbaa3d80 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/configuration/DockerConfigurationMetadataTests.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/configuration/DockerConfigurationMetadataTests.java @@ -16,11 +16,13 @@ package org.springframework.boot.buildpack.platform.docker.configuration; +import java.io.File; import java.net.URISyntaxException; import java.net.URL; import java.nio.file.Paths; import java.util.LinkedHashMap; import java.util.Map; +import java.util.regex.Pattern; import org.junit.jupiter.api.Test; @@ -76,7 +78,8 @@ class DockerConfigurationMetadataTests extends AbstractJsonTests { DockerContext context = config.forContext("test-context"); assertThat(context.getDockerHost()).isEqualTo("unix:///home/user/.docker/docker.sock"); assertThat(context.isTlsVerify()).isTrue(); - assertThat(context.getTlsPath()).matches("^.*/with-default-context/contexts/tls/[a-zA-z0-9]*/docker$"); + assertThat(context.getTlsPath()).matches(String.join(Pattern.quote(File.separator), "^.*", + "with-default-context", "contexts", "tls", "[a-zA-z0-9]*", "docker$")); } @Test