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

openvidu-test-e2e: change kurento-media-server management

pull/255/head
pabloFuente 2019-03-25 11:34:55 +01:00
parent 7bfef13fe1
commit 402b23ecb3
1 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -123,6 +123,7 @@ public class OpenViduTestAppE2eTest {
private final Object lock = new Object(); private final Object lock = new Object();
private static final Logger log = LoggerFactory.getLogger(OpenViduTestAppE2eTest.class); private static final Logger log = LoggerFactory.getLogger(OpenViduTestAppE2eTest.class);
private static final CommandLineExecutor commandLine = new CommandLineExecutor();
MyUser user; MyUser user;
Collection<MyUser> otherUsers = new ArrayList<>(); Collection<MyUser> otherUsers = new ArrayList<>();
@ -133,7 +134,7 @@ public class OpenViduTestAppE2eTest {
@BeforeAll() @BeforeAll()
static void setupAll() { static void setupAll() {
String ffmpegOutput = new CommandLineExecutor().executeCommand("which ffmpeg"); String ffmpegOutput = commandLine.executeCommand("which ffmpeg");
if (ffmpegOutput == null || ffmpegOutput.isEmpty()) { if (ffmpegOutput == null || ffmpegOutput.isEmpty()) {
log.error("ffmpeg package is not installed in the host machine"); log.error("ffmpeg package is not installed in the host machine");
Assert.fail(); Assert.fail();
@ -260,7 +261,7 @@ public class OpenViduTestAppE2eTest {
isRecordingTest = false; isRecordingTest = false;
} }
if (isKurentoRestartTest) { if (isKurentoRestartTest) {
new CommandLineExecutor().executeCommand("sudo service kurento-media-server restart"); this.restartKms();
} }
} }
@ -2583,9 +2584,7 @@ public class OpenViduTestAppE2eTest {
List<Session> sessions = OV.getActiveSessions(); List<Session> sessions = OV.getActiveSessions();
Assert.assertEquals("Expected no active sessions but found " + sessions.size(), 0, sessions.size()); Assert.assertEquals("Expected no active sessions but found " + sessions.size(), 0, sessions.size());
final CommandLineExecutor exec = new CommandLineExecutor(); this.stopKms();
exec.executeCommand("sudo service kurento-media-server stop");
OV.fetch(); OV.fetch();
@ -2607,7 +2606,7 @@ public class OpenViduTestAppE2eTest {
user.getDriver().findElement(By.id("remove-user-btn")).sendKeys(Keys.ENTER); user.getDriver().findElement(By.id("remove-user-btn")).sendKeys(Keys.ENTER);
exec.executeCommand("sudo service kurento-media-server start"); this.startKms();
Thread.sleep(3000); Thread.sleep(3000);
// Connect one subscriber with connection to KMS -> restart KMS -> connect a // Connect one subscriber with connection to KMS -> restart KMS -> connect a
@ -2623,7 +2622,7 @@ public class OpenViduTestAppE2eTest {
sessions = OV.getActiveSessions(); sessions = OV.getActiveSessions();
Assert.assertEquals("Expected 1 active sessions but found " + sessions.size(), 1, sessions.size()); Assert.assertEquals("Expected 1 active sessions but found " + sessions.size(), 1, sessions.size());
exec.executeCommand("sudo service kurento-media-server restart"); this.restartKms();
Thread.sleep(3000); Thread.sleep(3000);
OV.fetch(); OV.fetch();
@ -2672,7 +2671,7 @@ public class OpenViduTestAppE2eTest {
reason); reason);
latch.countDown(); latch.countDown();
}); });
exec.executeCommand("sudo service kurento-media-server restart"); this.restartKms();
long recEndTime = System.currentTimeMillis(); long recEndTime = System.currentTimeMillis();
user.getEventManager().waitUntilEventReaches("recordingStopped", 2); user.getEventManager().waitUntilEventReaches("recordingStopped", 2);
user.getEventManager().waitUntilEventReaches("streamDestroyed", 2); user.getEventManager().waitUntilEventReaches("streamDestroyed", 2);
@ -2945,4 +2944,17 @@ public class OpenViduTestAppE2eTest {
return colorMap; return colorMap;
} }
private void stopKms() {
commandLine.executeCommand("sudo kill -9 $(pidof kurento-media-server)");
}
private void startKms() {
commandLine.executeCommand("/usr/bin/kurento-media-server");
}
private void restartKms() {
this.stopKms();
this.startKms();
}
} }