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

Revert "e2e: increate delay to setup some browser tests" 

This reverts commit 7e45b027de.
v2
cruizba 2024-12-10 14:04:32 +01:00
parent 7e45b027de
commit 023c1c188f
3 changed files with 17 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -376,10 +376,6 @@ public class OpenViduTestE2e {
} }
protected BrowserUser setupBrowser(String browser) throws Exception { protected BrowserUser setupBrowser(String browser) throws Exception {
return setupBrowser(browser, 5000);
}
protected BrowserUser setupBrowser(String browser, long startDelay) throws Exception {
BrowserUser browserUser = null; BrowserUser browserUser = null;
GenericContainer<?> container; GenericContainer<?> container;
@ -388,58 +384,58 @@ public class OpenViduTestE2e {
switch (browser) { switch (browser) {
case "chrome": case "chrome":
container = chromeContainer("selenium/standalone-chrome:" + CHROME_VERSION, 2147483648L, 1, true); container = chromeContainer("selenium/standalone-chrome:" + CHROME_VERSION, 2147483648L, 1, true);
setupBrowserAux(BrowserNames.CHROME, container, false, startDelay); setupBrowserAux(BrowserNames.CHROME, container, false);
browserUser = new ChromeUser("TestUser", 50, true); browserUser = new ChromeUser("TestUser", 50, true);
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, true);
setupBrowserAux(BrowserNames.CHROME, container, false, startDelay); setupBrowserAux(BrowserNames.CHROME, container, false);
browserUser = new ChromeUser("TestUser", 50, true); browserUser = new ChromeUser("TestUser", 50, true);
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);
setupBrowserAux(BrowserNames.CHROME, container, false, startDelay); setupBrowserAux(BrowserNames.CHROME, container, false);
browserUser = new ChromeUser("TestUser", 50, "OpenVidu TestApp"); browserUser = new ChromeUser("TestUser", 50, "OpenVidu TestApp");
break; break;
case "chromeAlternateFakeVideo": case "chromeAlternateFakeVideo":
container = chromeContainer("selenium/standalone-chrome:" + CHROME_VERSION, 2147483648L, 1, true); container = chromeContainer("selenium/standalone-chrome:" + CHROME_VERSION, 2147483648L, 1, true);
setupBrowserAux(BrowserNames.CHROME, container, false, startDelay); setupBrowserAux(BrowserNames.CHROME, container, false);
path = Paths.get("/opt/openvidu/barcode.y4m"); path = Paths.get("/opt/openvidu/barcode.y4m");
checkMediafilePath(path); checkMediafilePath(path);
browserUser = new ChromeUser("TestUser", 50, path); browserUser = new ChromeUser("TestUser", 50, path);
break; break;
case "chromeFakeAudio": case "chromeFakeAudio":
container = chromeContainer("selenium/standalone-chrome:" + CHROME_VERSION, 2147483648L, 1, true); container = chromeContainer("selenium/standalone-chrome:" + CHROME_VERSION, 2147483648L, 1, true);
setupBrowserAux(BrowserNames.CHROME, container, false, startDelay); setupBrowserAux(BrowserNames.CHROME, container, false);
path = Paths.get("/opt/openvidu/stt-test.wav"); path = Paths.get("/opt/openvidu/stt-test.wav");
checkMediafilePath(path); checkMediafilePath(path);
browserUser = new ChromeUser("TestUser", 50, null, path); browserUser = new ChromeUser("TestUser", 50, null, path);
break; break;
case "chromeVirtualBackgroundFakeVideo": case "chromeVirtualBackgroundFakeVideo":
container = chromeContainer("selenium/standalone-chrome:" + CHROME_VERSION, 2147483648L, 1, false); container = chromeContainer("selenium/standalone-chrome:" + CHROME_VERSION, 2147483648L, 1, false);
setupBrowserAux(BrowserNames.CHROME, container, false, startDelay); setupBrowserAux(BrowserNames.CHROME, container, false);
path = Paths.get("/opt/openvidu/girl.mjpeg"); path = Paths.get("/opt/openvidu/girl.mjpeg");
checkMediafilePath(path); checkMediafilePath(path);
browserUser = new ChromeUser("TestUser", 50, path, false); browserUser = new ChromeUser("TestUser", 50, path, false);
break; break;
case "firefox": case "firefox":
container = firefoxContainer("selenium/standalone-firefox:" + FIREFOX_VERSION, 2147483648L, 1, true); container = firefoxContainer("selenium/standalone-firefox:" + FIREFOX_VERSION, 2147483648L, 1, true);
setupBrowserAux(BrowserNames.FIREFOX, container, false, startDelay); setupBrowserAux(BrowserNames.FIREFOX, container, false);
browserUser = new FirefoxUser("TestUser", 50, false); browserUser = new FirefoxUser("TestUser", 50, false);
break; break;
case "firefoxDisabledOpenH264": case "firefoxDisabledOpenH264":
container = firefoxContainer("selenium/standalone-firefox:" + FIREFOX_VERSION, 2147483648L, 1, true); container = firefoxContainer("selenium/standalone-firefox:" + FIREFOX_VERSION, 2147483648L, 1, true);
setupBrowserAux(BrowserNames.FIREFOX, container, false, startDelay); setupBrowserAux(BrowserNames.FIREFOX, container, false);
browserUser = new FirefoxUser("TestUser", 50, true); browserUser = new FirefoxUser("TestUser", 50, true);
break; break;
case "opera": case "opera":
container = operaContainer("selenium/standalone-opera:" + OPERA_VERSION, 2147483648L, 1); container = operaContainer("selenium/standalone-opera:" + OPERA_VERSION, 2147483648L, 1);
setupBrowserAux(BrowserNames.OPERA, container, false, startDelay); setupBrowserAux(BrowserNames.OPERA, container, false);
browserUser = new OperaUser("TestUser", 50); browserUser = new OperaUser("TestUser", 50);
break; break;
case "edge": case "edge":
container = edgeContainer("selenium/standalone-edge:" + EDGE_VERSION, 2147483648L, 1, true); container = edgeContainer("selenium/standalone-edge:" + EDGE_VERSION, 2147483648L, 1, true);
setupBrowserAux(BrowserNames.EDGE, container, false, startDelay); setupBrowserAux(BrowserNames.EDGE, container, false);
browserUser = new EdgeUser("TestUser", 50); browserUser = new EdgeUser("TestUser", 50);
break; break;
case "androidChrome": case "androidChrome":
@ -466,7 +462,7 @@ public class OpenViduTestE2e {
return browserUser; return browserUser;
} }
private static boolean setupBrowserAux(BrowserNames browser, GenericContainer<?> container, boolean forceRestart, long startDelay) { private static 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);
@ -491,7 +487,7 @@ public class OpenViduTestE2e {
protected static GenericContainer<?> setupDockerAndroidContainer() throws Exception { protected static GenericContainer<?> setupDockerAndroidContainer() throws Exception {
GenericContainer<?> container = androidContainer(DOCKER_ANDROID_IMAGE, 4294967296L); GenericContainer<?> container = androidContainer(DOCKER_ANDROID_IMAGE, 4294967296L);
boolean newContainer = setupBrowserAux(BrowserNames.ANDROID, container, false, 5000); boolean newContainer = setupBrowserAux(BrowserNames.ANDROID, container, false);
if (!newContainer) { if (!newContainer) {
container = containers.stream().filter(c -> DOCKER_ANDROID_IMAGE.equals(c.getDockerImageName())).findFirst() container = containers.stream().filter(c -> DOCKER_ANDROID_IMAGE.equals(c.getDockerImageName())).findFirst()
.get(); .get();

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

@ -28,15 +28,7 @@ public class AbstractOpenViduTestappE2eTest extends OpenViduTestE2e {
} }
protected OpenViduTestappUser setupBrowserAndConnectToOpenViduTestapp(String browser) throws Exception { protected OpenViduTestappUser setupBrowserAndConnectToOpenViduTestapp(String browser) throws Exception {
BrowserUser browserUser = this.setupBrowser(browser, 5000); BrowserUser browserUser = this.setupBrowser(browser);
OpenViduTestappUser testappUser = new OpenViduTestappUser(browserUser);
this.testappUsers.add(testappUser);
this.connectToOpenViduTestApp(testappUser);
return testappUser;
}
protected OpenViduTestappUser setupBrowserAndConnectToOpenViduTestapp(String browser, long startDelay) throws Exception {
BrowserUser browserUser = this.setupBrowser(browser, startDelay);
OpenViduTestappUser testappUser = new OpenViduTestappUser(browserUser); OpenViduTestappUser testappUser = new OpenViduTestappUser(browserUser);
this.testappUsers.add(testappUser); this.testappUsers.add(testappUser);
this.connectToOpenViduTestApp(testappUser); this.connectToOpenViduTestApp(testappUser);

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

@ -154,7 +154,7 @@ public class OpenViduTestAppE2eTest extends AbstractOpenViduTestappE2eTest {
@Test @Test
@DisplayName("One2One Edge") @DisplayName("One2One Edge")
void oneToOneEdge() throws Exception { void oneToOneEdge() throws Exception {
OpenViduTestappUser user = setupBrowserAndConnectToOpenViduTestapp("edge", 20000); OpenViduTestappUser user = setupBrowserAndConnectToOpenViduTestapp("edge");
log.info("One2One Edge"); log.info("One2One Edge");
oneToOneAux(user); oneToOneAux(user);
} }
@ -453,7 +453,7 @@ public class OpenViduTestAppE2eTest extends AbstractOpenViduTestappE2eTest {
Thread threadChrome = new Thread(() -> { Thread threadChrome = new Thread(() -> {
try { try {
browserTest.apply(setupBrowserAndConnectToOpenViduTestapp("chrome", 20000), "Chrome"); browserTest.apply(setupBrowserAndConnectToOpenViduTestapp("chrome"), "Chrome");
} catch (Exception e) { } catch (Exception e) {
String errMsg = "Error setting up browser: " + e.getMessage(); String errMsg = "Error setting up browser: " + e.getMessage();
System.err.println(errMsg); System.err.println(errMsg);
@ -463,7 +463,7 @@ public class OpenViduTestAppE2eTest extends AbstractOpenViduTestappE2eTest {
}); });
Thread threadFirefox = new Thread(() -> { Thread threadFirefox = new Thread(() -> {
try { try {
browserTest.apply(setupBrowserAndConnectToOpenViduTestapp("firefox", 20000), "Firefox"); browserTest.apply(setupBrowserAndConnectToOpenViduTestapp("firefox"), "Firefox");
} catch (Exception e) { } catch (Exception e) {
String errMsg = "Error setting up browser: " + e.getMessage(); String errMsg = "Error setting up browser: " + e.getMessage();
System.err.println(errMsg); System.err.println(errMsg);
@ -473,7 +473,7 @@ public class OpenViduTestAppE2eTest extends AbstractOpenViduTestappE2eTest {
}); });
Thread threadEdge = new Thread(() -> { Thread threadEdge = new Thread(() -> {
try { try {
browserTest.apply(setupBrowserAndConnectToOpenViduTestapp("edge", 20000), "Edge"); browserTest.apply(setupBrowserAndConnectToOpenViduTestapp("edge"), "Edge");
} catch (Exception e) { } catch (Exception e) {
String errMsg = "Error setting up browser: " + e.getMessage(); String errMsg = "Error setting up browser: " + e.getMessage();
System.err.println(errMsg); System.err.println(errMsg);