Skip to content

Commit d67abf6

Browse files
committed
[java][grid]: video file name set independently in dynamic grid via se:videoName
1 parent dec42aa commit d67abf6

File tree

1 file changed

+12
-4
lines changed

1 file changed

+12
-4
lines changed

java/src/org/openqa/selenium/grid/node/docker/DockerSessionFactory.java

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -373,13 +373,21 @@ private Map<String, String> getVideoContainerEnvVars(
373373
// Capabilities set to env vars with higher precedence
374374
setCapsToEnvVars(sessionRequestCapabilities, envVars);
375375
envVars.put("DISPLAY_CONTAINER_NAME", containerIp);
376-
Optional<String> testName = ofNullable(getTestName(sessionRequestCapabilities));
377-
testName.ifPresent(name -> envVars.put("SE_VIDEO_FILE_NAME", String.format("%s.mp4", name)));
376+
Optional<String> videoName =
377+
ofNullable(getVideoFileName(sessionRequestCapabilities, "se:videoName"));
378+
if (videoName.isPresent()) {
379+
envVars.put("SE_VIDEO_FILE_NAME", String.format("%s.mp4", videoName.get()));
380+
} else {
381+
Optional<String> testName =
382+
ofNullable(getVideoFileName(sessionRequestCapabilities, "se:name"));
383+
testName.ifPresent(name -> envVars.put("SE_VIDEO_FILE_NAME", String.format("%s.mp4", name)));
384+
}
378385
return envVars;
379386
}
380387

381-
private String getTestName(Capabilities sessionRequestCapabilities) {
382-
Optional<Object> testName = ofNullable(sessionRequestCapabilities.getCapability("se:name"));
388+
private String getVideoFileName(Capabilities sessionRequestCapabilities, String capabilityName) {
389+
Optional<Object> testName =
390+
ofNullable(sessionRequestCapabilities.getCapability(capabilityName));
383391
if (testName.isPresent()) {
384392
String name = testName.get().toString();
385393
if (!name.isEmpty()) {

0 commit comments

Comments
 (0)