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

Merge remote-tracking branch 'origin/HEAD' into deploy-docker-compose

pull/431/head
micaelgallego 2020-04-07 03:54:19 +02:00
parent c49713dfdb e36772476e
commit bc2ced6220
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openvidu-test-e2e/jenkins/Jenkinsfile vendored
View File

@ -15,7 +15,7 @@ node('container') {
sh 'rm -rf kurento-java || true' sh 'rm -rf kurento-java || true'
sh 'rm -rf /opt/openvidu/recordings/* || true' sh 'rm -rf /opt/openvidu/recordings/* || true'
sh 'git clone https://github.com/OpenVidu/openvidu.git' sh 'git clone https://github.com/OpenVidu/openvidu.git'
sh 'cd openvidu && git checkout $OPENVIDU_COMMIT' sh 'cd openvidu && git fetch origin && git checkout $OPENVIDU_COMMIT'
sh(script: '''#!/bin/bash sh(script: '''#!/bin/bash
if $KURENTO_JAVA_SNAPSHOT ; then if $KURENTO_JAVA_SNAPSHOT ; then
git clone https://github.com/Kurento/kurento-java.git git clone https://github.com/Kurento/kurento-java.git

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

@ -2283,16 +2283,16 @@ public class OpenViduTestAppE2eTest {
Assert.assertFalse("Wrong recording hasAudio", recording2.hasAudio()); Assert.assertFalse("Wrong recording hasAudio", recording2.hasAudio());
Assert.assertTrue("Wrong recording hasVideo", recording2.hasVideo()); Assert.assertTrue("Wrong recording hasVideo", recording2.hasVideo());
Thread.sleep(5000); Thread.sleep(7000);
recording2 = OV.stopRecording(recording2.getId()); recording2 = OV.stopRecording(recording2.getId());
user.getEventManager().waitUntilEventReaches("recordingStopped", 3); user.getEventManager().waitUntilEventReaches("recordingStopped", 3);
Assert.assertTrue("Wrong recording duration", recording2.getDuration() > 0);
Assert.assertTrue("Wrong recording size", recording2.getSize() > 0); Assert.assertTrue("Wrong recording size", recording2.getSize() > 0);
Assert.assertNotNull("Wrong recording url", recording2.getUrl()); Assert.assertNotNull("Wrong recording url", recording2.getUrl());
Assert.assertEquals("Wrong recording status", Recording.Status.ready, recording2.getStatus()); Assert.assertEquals("Wrong recording status", Recording.Status.ready, recording2.getStatus());
Assert.assertTrue("Wrong recording duration", recording2.getDuration() > 0);
Assert.assertFalse("Session shouldn't be being recorded", session.isBeingRecorded()); Assert.assertFalse("Session shouldn't be being recorded", session.isBeingRecorded());
Assert.assertFalse("Session.fetch() should return false", session.fetch()); Assert.assertFalse("Session.fetch() should return false", session.fetch());