From dddb0774e25a0cf0e1b71162044c588b1bedeaf7 Mon Sep 17 00:00:00 2001 From: Dariusz Czajkiewicz Date: Thu, 20 Feb 2025 08:16:46 +0100 Subject: [PATCH] test containers --- .../resources/MyTestResources.java | 26 ++++--------------- 1 file changed, 5 insertions(+), 21 deletions(-) diff --git a/mrchecker-playwright-framework/src/test/java/com/capgemini/infrastructure/resources/MyTestResources.java b/mrchecker-playwright-framework/src/test/java/com/capgemini/infrastructure/resources/MyTestResources.java index 6ad4685e..9677202d 100644 --- a/mrchecker-playwright-framework/src/test/java/com/capgemini/infrastructure/resources/MyTestResources.java +++ b/mrchecker-playwright-framework/src/test/java/com/capgemini/infrastructure/resources/MyTestResources.java @@ -24,28 +24,14 @@ public Map start() { } private void startWebServer() { - var isContainerRunning = isContainerRunning(Configuration.MY_WEB_APP); - if (!isContainerRunning || rawmindWebContainer == null) { // Only start if it's NOT running + if (rawmindWebContainer == null || !isContainerRunning(Configuration.MY_WEB_APP)) { rawmindWebContainer = new RawmindWebContainer(network); - rawmindWebContainer.withCreateContainerCmdModifier(cmd -> cmd.withName(Configuration.MY_WEB_APP)); rawmindWebContainer.start(); + if (!rawmindWebContainer.getContainerName().contains(Configuration.MY_WEB_APP)) { + rawmindWebContainer.withCreateContainerCmdModifier(cmd -> cmd.withName(Configuration.MY_WEB_APP)); + } } -// if(isContainerRunning && rawmindWebContainer == null){ -// rawmindWebContainer = new RawmindWebContainer(network,DockerClientFactory.instance().client().listContainersCmd() -// .withShowAll(true) -// .exec() -// .stream() -// .filter(container -> container.getNames()[0].contains(Configuration.MY_WEB_APP)).findFirst().get()); -// } -// -// Container container = dockerClient.listContainersCmd().exec().get(0); -// -// RawmindWebContainer rawmindContainer = new RawmindWebContainer(); -// rawmindContainer.setId(container.getId()); -// rawmindContainer.setName(container.getNames()[0]); // Assuming name exists -// rawmindContainer.setImage(container.getImage()); -//// Add more fields if necessary - + Configuration.getInstance().setMyWebAppUrl(rawmindWebContainer.getUrl()); } private boolean isContainerRunning(String containerName) { @@ -56,7 +42,6 @@ private boolean isContainerRunning(String containerName) { .anyMatch(container -> container.getNames()[0].contains(containerName)); } - @Override public void stop() { if (!Configuration.DEBUG) { @@ -64,7 +49,6 @@ public void stop() { } } - private void stopContainer(GenericContainer container) { if (container != null) { container.stop();