-
-
Notifications
You must be signed in to change notification settings - Fork 1.6k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Make default file recording directory of BrowserWebDriverContainer platform independent #2562
Merged
Merged
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
036fba6
Make default file recording directory of BrowserWebDriverContainer pl…
kiview a17080f
Only create temp directory if recording enabled
kiview 8681190
Private TC prefix constant
kiview dbc0f71
Merge branch 'master' into vnc-windows-defaultdir-fix
bsideup File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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 { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. IMO we should move it to There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Moved the code. |
||
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()); | ||
} | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Private?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Of course, sorry.