Skip to content

Commit 184af29

Browse files
committed
[grid] Saving capabilities for all docker tests [skip ci]
1 parent 04ec49d commit 184af29

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

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

+6-4
Original file line numberDiff line numberDiff line change
@@ -188,8 +188,10 @@ public Optional<ActiveSession> apply(CreateSessionRequest sessionRequest) {
188188
span.setStatus(Status.CANCELLED);
189189

190190
EXCEPTION.accept(attributeMap, e);
191-
attributeMap.put(AttributeKey.EXCEPTION_MESSAGE.getKey(),
192-
EventAttribute.setValue("Unable to create session. Stopping and container: " + e.getMessage()));
191+
attributeMap.put(
192+
AttributeKey.EXCEPTION_MESSAGE.getKey(),
193+
EventAttribute
194+
.setValue("Unable to create session. Stopping and container: " + e.getMessage()));
193195
span.addEvent(AttributeKey.EXCEPTION_EVENT.getKey(), attributeMap);
194196

195197
container.stop(Duration.ofMinutes(1));
@@ -199,16 +201,16 @@ public Optional<ActiveSession> apply(CreateSessionRequest sessionRequest) {
199201

200202
SessionId id = new SessionId(response.getSessionId());
201203
Capabilities capabilities = new ImmutableCapabilities((Map<?, ?>) response.getValue());
204+
Optional<Path> sessionAssetsPath = createSessionAssetsPath(assetsPath, id);
205+
sessionAssetsPath.ifPresent(path -> saveSessionCapabilities(capabilities, path));
202206
Container videoContainer = null;
203207
if (isVideoRecordingAvailable && recordVideoForSession(capabilities)) {
204208
Map<String, String> envVars = getVideoContainerEnvVars(
205209
capabilities,
206210
containerInfo.getIp());
207-
Optional<Path> sessionAssetsPath = createSessionAssetsPath(assetsPath, id);
208211
if (sessionAssetsPath.isPresent()) {
209212
Map<String, String> volumeBinds =
210213
Collections.singletonMap(sessionAssetsPath.get().toString(), "/videos");
211-
saveSessionCapabilities(capabilities, sessionAssetsPath.get());
212214
videoContainer = docker.create(image(videoImage).env(envVars).bind(volumeBinds));
213215
videoContainer.start();
214216
LOG.info(String.format("Video container started (id: %s)", videoContainer.getId()));

0 commit comments

Comments
 (0)