Skip to content

[build] Fix RBE tests #17233

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.

Sign up for GitHub

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

Merged
VietND96 merged 1 commit into from
Mar 17, 2026
Merged

[build] Fix RBE tests #17233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions java/src/org/openqa/selenium/concurrent/Lazy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ public T get() {
if (value == null) {
try {
value = supplier.get();
} catch (RuntimeException e) {
throw e;
} catch (Exception e) {
throw new InitializationException(e);
Comment thread
VietND96 marked this conversation as resolved.
}
Expand Down
4 changes: 0 additions & 4 deletions java/test/org/openqa/selenium/bidi/emulation/SetScreenSettingsOverrideTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assumptions.assumeThat;
import static org.openqa.selenium.testing.drivers.Browser.CHROME;
import static org.openqa.selenium.testing.drivers.Browser.EDGE;

import java.util.List;
import java.util.Map;
Expand All @@ -33,7 +32,6 @@
import org.openqa.selenium.bidi.module.Browser;
import org.openqa.selenium.testing.JupiterTestBase;
import org.openqa.selenium.testing.NeedsFreshDriver;
import org.openqa.selenium.testing.NotYetImplemented;
import org.openqa.selenium.testing.TestUtilities;

class SetScreenSettingsOverrideTest extends JupiterTestBase {
Expand All @@ -48,7 +46,6 @@ private Dimension getScreenDimensions(String context) {

@Test
@NeedsFreshDriver
@NotYetImplemented(EDGE)
void canSetScreenSettingsOverrideInContext() {
if (org.openqa.selenium.testing.drivers.Browser.detect() == CHROME) {
assumeThat(TestUtilities.getChromeVersion(driver)).isGreaterThanOrEqualTo(146);
Expand Down Expand Up @@ -82,7 +79,6 @@ void canSetScreenSettingsOverrideInContext() {

@Test
@NeedsFreshDriver
@NotYetImplemented(EDGE)
void canSetScreenSettingsOverrideInUserContext() {
if (org.openqa.selenium.testing.drivers.Browser.detect() == CHROME) {
assumeThat(TestUtilities.getChromeVersion(driver)).isGreaterThanOrEqualTo(146);
Expand Down
13 changes: 12 additions & 1 deletion java/test/org/openqa/selenium/grid/node/docker/DockerSessionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@
import static org.mockito.Mockito.when;

import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.DataOutputStream;
import java.net.URL;
import java.nio.file.Files;
import java.nio.file.Path;
Expand Down Expand Up @@ -128,11 +130,20 @@ void stopWithoutVideo_logsAndBrowserContainerStopped() throws Exception {
@Test
void stop_logsWrittenBeforeBrowserContainerStopped() throws Exception {
byte[] logBytes = "INFO: Session started\nINFO: Session ended\n".getBytes();
// Docker multiplexed stream format: [stream-type(1)][padding(3)][payload-size(4)][payload]
ByteArrayOutputStream buf = new ByteArrayOutputStream();
DataOutputStream header = new DataOutputStream(buf);
header.writeByte(1); // stdout
header.write(new byte[3]); // padding
header.writeInt(logBytes.length);
header.flush();
buf.write(logBytes);
byte[] multiplexed = buf.toByteArray();
when(browserContainer.getLogs())
.thenReturn(
new ContainerLogs(
new ContainerId("browser-id"),
Contents.fromStream(new ByteArrayInputStream(logBytes), logBytes.length)));
Contents.fromStream(new ByteArrayInputStream(multiplexed), multiplexed.length)));

// saveLogs() writes to sessionAssetsPath/selenium-server.log; parent dir must exist
Path sessionDir = tempDir.resolve(sessionId.toString());
Expand Down
Loading