Skip to content

Commit 8e59feb

Browse files
committed
[grid] Get TZ from parent container when not passed as cap.
Fixes #11289
1 parent b836aa3 commit 8e59feb

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

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

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -313,8 +313,8 @@ private Map<String, String> getBrowserContainerEnvVars(Capabilities sessionReque
313313
timeZone.ifPresent(zone -> envVars.put("TZ", zone.getID()));
314314
// Passing env vars set to the child container
315315
Map<String, String> seEnvVars = System.getenv();
316-
seEnvVars.entrySet()
317-
.stream().filter(entry -> entry.getKey().startsWith("SE_"))
316+
seEnvVars.entrySet().stream()
317+
.filter(entry -> entry.getKey().startsWith("SE_"))
318318
.forEach(entry -> envVars.put(entry.getKey(), entry.getValue()));
319319
return envVars;
320320
}
@@ -373,11 +373,15 @@ private TimeZone getTimeZone(Capabilities sessionRequestCapabilities) {
373373
Optional<Object> timeZone =
374374
ofNullable(sessionRequestCapabilities.getCapability("se:timeZone"));
375375
if (timeZone.isPresent()) {
376-
String tz = timeZone.get().toString();
376+
String tz = timeZone.get().toString();
377377
if (Arrays.asList(TimeZone.getAvailableIDs()).contains(tz)) {
378378
return TimeZone.getTimeZone(tz);
379379
}
380380
}
381+
String envTz = System.getenv("TZ");
382+
if (Arrays.asList(TimeZone.getAvailableIDs()).contains(envTz)) {
383+
return TimeZone.getTimeZone(envTz);
384+
}
381385
return null;
382386
}
383387

0 commit comments

Comments
 (0)