Skip to content
This repository has been archived by the owner on Sep 21, 2021. It is now read-only.

Commit

Permalink
Following #1156 suggestion, maybe it fixes the issue, should not hurt…
Browse files Browse the repository at this point in the history
… current flow
  • Loading branch information
diemol committed Mar 21, 2020
1 parent be98235 commit 6a57515
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
package de.zalando.ep.zalenium.proxy;

import java.io.IOException;
import java.nio.file.CopyOption;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.nio.file.StandardCopyOption;
import java.util.List;
import java.util.Map;
import java.util.Optional;
Expand Down Expand Up @@ -658,7 +660,7 @@ void copyVideos(final String containerId) {
if (!Files.exists(videoFile.getParent())) {
Files.createDirectories(videoFile.getParent());
}
Files.copy(entry.get(), videoFile);
Files.copy(entry.get(), videoFile, StandardCopyOption.REPLACE_EXISTING);
CommonProxyUtilities.setFilePermissions(videoFile);
videoWasCopied = true;
LOGGER.debug("Video file copied to: {}/{}", testInformation.getVideoFolderPath(), testInformation.getFileName());
Expand Down Expand Up @@ -869,4 +871,4 @@ public enum ShutdownType {
}


}
}
4 changes: 2 additions & 2 deletions src/test/java/de/zalando/ep/zalenium/it/ParallelIT.java
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public class ParallelIT {
private static final String testingBotIntegration = "testingBot";
private static final String crossBrowserTestingIntegration = "crossBrowserTesting";
private static final String lambdaTestIntegration = "lambdaTest";

// Zalenium setup variables
private static final String ZALENIUM_HOST = System.getenv("ZALENIUM_GRID_HOST") != null ?
System.getenv("ZALENIUM_GRID_HOST") : "localhost";
Expand Down Expand Up @@ -183,7 +183,7 @@ public void loadTheInternetPageAndCheckTitle(DesiredCapabilities desiredCapabili
// Go to the homepage
getWebDriver().get("https://the-internet.herokuapp.com/");

// Assert that the title is the expected one
// Assert that the titleDockerSeleniumRemoteProxy is the expected one
assertThat(getWebDriver().getTitle(), containsString("Internet"));
}

Expand Down

0 comments on commit 6a57515

Please sign in to comment.