ambiser
/
openvidu
mirror of https://github.com/OpenVidu/openvidu.git
9
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

openvidu-test-e2e: fix two chrome simultaneous testcontainers

pull/884/merge
pabloFuente 2026-06-02 14:20:25 +02:00
parent 12e3aa7117
commit 7153f94522
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
openvidu-test-e2e/src/main/java/io/openvidu/test/e2e/OpenViduTestE2e.java
View File

@ -441,9 +441,9 @@ public class OpenViduTestE2e {
browserUser = new ChromeUser("TestUser", 50, headless); browserUser = new ChromeUser("TestUser", 50, headless);
break; break;
case "chromeTwoInstances": case "chromeTwoInstances":
container = chromeContainer("selenium/standalone-chrome:" + CHROME_VERSION, 2147483648L, 2, true); container = chromeContainer("selenium/standalone-chrome:" + CHROME_VERSION, 2147483648L, 2, headless);
setupBrowserAux(BrowserNames.CHROME, container, false); setupBrowserAux(BrowserNames.CHROME, container, false);
browserUser = new ChromeUser("TestUser", 50, true); browserUser = new ChromeUser("TestUser", 50, headless);
break; break;
case "chromeAlternateScreenShare": case "chromeAlternateScreenShare":
container = chromeContainer("selenium/standalone-chrome:" + CHROME_VERSION, 2147483648L, 1, false); container = chromeContainer("selenium/standalone-chrome:" + CHROME_VERSION, 2147483648L, 1, false);
@ -512,7 +512,7 @@ public class OpenViduTestE2e {
return browserUser; return browserUser;
} }
private static boolean setupBrowserAux(BrowserNames browser, GenericContainer<?> container, boolean forceRestart) { private static synchronized boolean setupBrowserAux(BrowserNames browser, GenericContainer<?> container, boolean forceRestart) {
if (isRemote(browser)) { if (isRemote(browser)) {
String dockerImage = container.getDockerImageName(); String dockerImage = container.getDockerImageName();
String ps = commandLine.executeCommand("docker ps | grep " + dockerImage, 30); String ps = commandLine.executeCommand("docker ps | grep " + dockerImage, 30);

10
openvidu-test-e2e/src/test/java/io/openvidu/test/e2e/OpenViduTestAppE2eTest.java
View File

@ -70,8 +70,6 @@ import io.minio.errors.InvalidResponseException;
import io.minio.errors.ServerException; import io.minio.errors.ServerException;
import io.minio.errors.XmlParserException; import io.minio.errors.XmlParserException;
import io.minio.messages.Item; import io.minio.messages.Item;
import io.openvidu.test.e2e.annotations.OnlyMediasoup;
import io.openvidu.test.e2e.annotations.OnlyPion;
import livekit.LivekitIngress.IngressInfo; import livekit.LivekitIngress.IngressInfo;
import livekit.LivekitIngress.IngressState; import livekit.LivekitIngress.IngressState;
@ -1313,14 +1311,14 @@ public class OpenViduTestAppE2eTest extends AbstractOpenViduTestappE2eTest {
@DisplayName("Chrome H264 simulcast BWE convergence") @DisplayName("Chrome H264 simulcast BWE convergence")
void chromeH264SimulcastBweConvergenceTest() throws Exception { void chromeH264SimulcastBweConvergenceTest() throws Exception {
log.info("Chrome H264 simulcast BWE convergence"); log.info("Chrome H264 simulcast BWE convergence");
simulcastBweConvergenceTest("h264", "chrome"); simulcastBweConvergenceTest("h264", "chromeTwoInstances");
} }
@Test @Test
@DisplayName("Chrome VP8 simulcast BWE convergence") @DisplayName("Chrome VP8 simulcast BWE convergence")
void chromeVP8SimulcastBweConvergenceTest() throws Exception { void chromeVP8SimulcastBweConvergenceTest() throws Exception {
log.info("Chrome VP8 simulcast BWE convergence"); log.info("Chrome VP8 simulcast BWE convergence");
simulcastBweConvergenceTest("vp8", "chrome"); simulcastBweConvergenceTest("vp8", "chromeTwoInstances");
} }
private void simulcastBweConvergenceTest(String publisherCodec, String subscriberBrowser) throws Exception { private void simulcastBweConvergenceTest(String publisherCodec, String subscriberBrowser) throws Exception {
@ -1340,9 +1338,11 @@ public class OpenViduTestAppE2eTest extends AbstractOpenViduTestappE2eTest {
final java.util.concurrent.atomic.AtomicLong subscriber1920AtMs = new java.util.concurrent.atomic.AtomicLong( final java.util.concurrent.atomic.AtomicLong subscriber1920AtMs = new java.util.concurrent.atomic.AtomicLong(
-1); -1);
final String publisherBrowser = subscriberBrowser == "chrome" ? "chromeTwoInstances" : "chrome";
Future<?> task1 = executor.submit(() -> { Future<?> task1 = executor.submit(() -> {
try { try {
OpenViduTestappUser chromeUser = setupBrowserAndConnectToOpenViduTestapp("chrome"); OpenViduTestappUser chromeUser = setupBrowserAndConnectToOpenViduTestapp(publisherBrowser);
this.addOnlyPublisherVideo(chromeUser, true, false, false); this.addOnlyPublisherVideo(chromeUser, true, false, false);
WebElement participantNameInput = chromeUser.getDriver() WebElement participantNameInput = chromeUser.getDriver()
.findElement(By.id("participant-name-input-0")); .findElement(By.id("participant-name-input-0"));