From 036fba6e4346f7db4510532573753d1a29bb247b Mon Sep 17 00:00:00 2001
From: Kevin Wittek <kevin@wittek.dev>
Date: Mon, 13 Apr 2020 09:55:14 +0200
Subject: [PATCH 1/3] Make default file recording directory of
 BrowserWebDriverContainer platform independent.

---
 .../containers/BrowserWebDriverContainer.java | 13 +++++++++++-
 ...ChromeRecordingWebDriverContainerTest.java | 20 ++++++++++++++++++-
 2 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java b/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java
index 9e1a2733a2e..f3ed8a0c05b 100644
--- a/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java
+++ b/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java
@@ -28,8 +28,10 @@
 import org.testcontainers.lifecycle.TestLifecycleAware;
 
 import java.io.File;
+import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.nio.file.Files;
 import java.time.Duration;
 import java.util.Optional;
 import java.util.Set;
@@ -52,6 +54,7 @@ public class BrowserWebDriverContainer<SELF extends BrowserWebDriverContainer<SE
     private static final int VNC_PORT = 5900;
 
     private static final String NO_PROXY_KEY = "no_proxy";
+    public static final String TC_TEMP_DIR_PREFIX = "tc";
 
     @Nullable
     private Capabilities capabilities;
@@ -61,7 +64,7 @@ public class BrowserWebDriverContainer<SELF extends BrowserWebDriverContainer<SE
     private RemoteWebDriver driver;
     private VncRecordingMode recordingMode = VncRecordingMode.RECORD_FAILING;
     private RecordingFileFactory recordingFileFactory;
-    private File vncRecordingDirectory = new File("/tmp");
+    private File vncRecordingDirectory;
 
     private VncRecordingContainer vncRecordingContainer = null;
 
@@ -79,6 +82,14 @@ public BrowserWebDriverContainer() {
                 .withStrategy(new HostPortWaitStrategy())
                 .withStartupTimeout(Duration.of(15, SECONDS));
 
+        try {
+            vncRecordingDirectory = Files.createTempDirectory(TC_TEMP_DIR_PREFIX).toFile();
+        } catch (IOException e) {
+            // should never happen as per javadoc, since we use valid prefix
+            logger().error("Exception while trying to create directory " + vncRecordingDirectory.getAbsolutePath(), e);
+            throw new RuntimeException(e);
+        }
+
         this.withRecordingFileFactory(new DefaultRecordingFileFactory());
     }
 
diff --git a/modules/selenium/src/test/java/org/testcontainers/junit/ChromeRecordingWebDriverContainerTest.java b/modules/selenium/src/test/java/org/testcontainers/junit/ChromeRecordingWebDriverContainerTest.java
index 6601242efa7..7e77f63a051 100644
--- a/modules/selenium/src/test/java/org/testcontainers/junit/ChromeRecordingWebDriverContainerTest.java
+++ b/modules/selenium/src/test/java/org/testcontainers/junit/ChromeRecordingWebDriverContainerTest.java
@@ -7,8 +7,10 @@
 import org.openqa.selenium.chrome.ChromeOptions;
 import org.testcontainers.containers.BrowserWebDriverContainer;
 import org.testcontainers.containers.DefaultRecordingFileFactory;
+import org.testcontainers.lifecycle.TestDescription;
 
 import java.io.File;
+import java.util.Optional;
 
 import static org.testcontainers.containers.BrowserWebDriverContainer.VncRecordingMode.RECORD_ALL;
 
@@ -36,8 +38,24 @@ public static class ChromeThatRecordsFailingTests {
                 .withCapabilities(new ChromeOptions());
 
         @Test
-        public void recordingTestThatShouldBeRecordedButDeleted() {
+        public void recordingTestThatShouldBeRecordedButNotPersisted() {
             doSimpleExplore(chrome);
         }
+
+        @Test
+        public void recordingTestThatShouldBeRecordedAndRetained() {
+            doSimpleExplore(chrome);
+            chrome.afterTest(new TestDescription() {
+                @Override
+                public String getTestId() {
+                    return getFilesystemFriendlyName();
+                }
+
+                @Override
+                public String getFilesystemFriendlyName() {
+                    return "ChromeThatRecordsFailingTests-recordingTestThatShouldBeRecordedAndRetained";
+                }
+            }, Optional.of(new RuntimeException("Force writing of video file.")));
+        }
     }
 }

From a17080fc3e860bcb33ad1293a780727e0496462c Mon Sep 17 00:00:00 2001
From: Kevin Wittek <kevin@wittek.dev>
Date: Mon, 13 Apr 2020 15:43:52 +0200
Subject: [PATCH 2/3] Only create temp directory if recording enabled

---
 .../containers/BrowserWebDriverContainer.java    | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java b/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java
index f3ed8a0c05b..1a4e9d234e6 100644
--- a/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java
+++ b/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java
@@ -82,14 +82,6 @@ public BrowserWebDriverContainer() {
                 .withStrategy(new HostPortWaitStrategy())
                 .withStartupTimeout(Duration.of(15, SECONDS));
 
-        try {
-            vncRecordingDirectory = Files.createTempDirectory(TC_TEMP_DIR_PREFIX).toFile();
-        } catch (IOException e) {
-            // should never happen as per javadoc, since we use valid prefix
-            logger().error("Exception while trying to create directory " + vncRecordingDirectory.getAbsolutePath(), e);
-            throw new RuntimeException(e);
-        }
-
         this.withRecordingFileFactory(new DefaultRecordingFileFactory());
     }
 
@@ -151,6 +143,14 @@ protected void configure() {
         }
 
         if (recordingMode != VncRecordingMode.SKIP) {
+            try {
+                vncRecordingDirectory = Files.createTempDirectory(TC_TEMP_DIR_PREFIX).toFile();
+            } catch (IOException e) {
+                // should never happen as per javadoc, since we use valid prefix
+                logger().error("Exception while trying to create temp directory " + vncRecordingDirectory.getAbsolutePath(), e);
+                throw new ContainerLaunchException("Exception while trying to create temp directory", e);
+            }
+
             if (getNetwork() == null) {
                 withNetwork(Network.SHARED);
             }

From 8681190084b83691441a65424d8d8bd5b126dac8 Mon Sep 17 00:00:00 2001
From: Kevin Wittek <kevin@wittek.dev>
Date: Mon, 13 Apr 2020 17:06:29 +0200
Subject: [PATCH 3/3] Private TC prefix constant

---
 .../testcontainers/containers/BrowserWebDriverContainer.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java b/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java
index 1a4e9d234e6..22a4b9d47a5 100644
--- a/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java
+++ b/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java
@@ -54,7 +54,7 @@ public class BrowserWebDriverContainer<SELF extends BrowserWebDriverContainer<SE
     private static final int VNC_PORT = 5900;
 
     private static final String NO_PROXY_KEY = "no_proxy";
-    public static final String TC_TEMP_DIR_PREFIX = "tc";
+    private static final String TC_TEMP_DIR_PREFIX = "tc";
 
     @Nullable
     private Capabilities capabilities;