From 98781e4f8916d7808561389639114c4160ea586f Mon Sep 17 00:00:00 2001 From: bogdan Date: Fri, 22 Sep 2017 13:06:03 +0300 Subject: [PATCH] Fix docker-compose executable check: refactoring based on review comments (#460) --- .../testcontainers/containers/DockerComposeContainer.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java b/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java index 4d06d1018de..10120e899f7 100644 --- a/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java +++ b/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java @@ -532,12 +532,11 @@ public void invoke() { } private boolean dockerComposeExecutableExists() { - boolean dockerComposeExists = CommandLine.executableExists(COMPOSE_EXECUTABLE); - if (!dockerComposeExists && SystemUtils.IS_OS_WINDOWS) { + if (SystemUtils.IS_OS_WINDOWS) { return CommandLine.executableExists(COMPOSE_EXECUTABLE + ".exe"); + } else { + return CommandLine.executableExists(COMPOSE_EXECUTABLE); } - - return dockerComposeExists; } /**