From 03b57c00cf4a0962c419a6a82e63f5d4ec4c9f26 Mon Sep 17 00:00:00 2001 From: pabloFuente Date: Mon, 15 Nov 2021 14:29:17 +0100 Subject: [PATCH] openvidu-test-e2e: more flexible composedQuickStartRecordTest --- .../test/e2e/OpenViduTestAppE2eTest.java | 35 ++++++++++++------- 1 file changed, 22 insertions(+), 13 deletions(-) diff --git a/openvidu-test-e2e/src/test/java/io/openvidu/test/e2e/OpenViduTestAppE2eTest.java b/openvidu-test-e2e/src/test/java/io/openvidu/test/e2e/OpenViduTestAppE2eTest.java index 3276ef64..66bcf919 100644 --- a/openvidu-test-e2e/src/test/java/io/openvidu/test/e2e/OpenViduTestAppE2eTest.java +++ b/openvidu-test-e2e/src/test/java/io/openvidu/test/e2e/OpenViduTestAppE2eTest.java @@ -1411,22 +1411,31 @@ public class OpenViduTestAppE2eTest extends AbstractOpenViduTestappE2eTest { session = OV.getActiveSessions().get(0); session.close(); - // Recording hasn't had time to start. Should trigger stopped, started, failed - event = CustomWebhook.waitForEvent("recordingStatusChanged", 1); // stopped - Assert.assertEquals("Wrong status in recordingStatusChanged event", "stopped", - event.get("status").getAsString()); - event = CustomWebhook.waitForEvent("recordingStatusChanged", 5); // started - Assert.assertEquals("Wrong status in recordingStatusChanged event", "started", - event.get("status").getAsString()); - event = CustomWebhook.waitForEvent("recordingStatusChanged", 1); // failed - Assert.assertEquals("Wrong status in recordingStatusChanged event", "failed", - event.get("status").getAsString()); + event = CustomWebhook.waitForEvent("recordingStatusChanged", 1); + if ("stopped".equals(event.get("status").getAsString())) { + // Recording hasn't had time to start. Should trigger stopped, started, failed + event = CustomWebhook.waitForEvent("recordingStatusChanged", 5); // started + Assert.assertEquals("Wrong status in recordingStatusChanged event", "started", + event.get("status").getAsString()); + event = CustomWebhook.waitForEvent("recordingStatusChanged", 1); // failed + Assert.assertEquals("Wrong status in recordingStatusChanged event", "failed", + event.get("status").getAsString()); + Assert.assertEquals("Wrong recording status", Recording.Status.failed, + OV.getRecording(sessionName + "-2").getStatus()); + } else { + // Recording did have time to start. Should trigger started, stopped, ready + event = CustomWebhook.waitForEvent("recordingStatusChanged", 5); // started + Assert.assertEquals("Wrong status in recordingStatusChanged event", "stopped", + event.get("status").getAsString()); + event = CustomWebhook.waitForEvent("recordingStatusChanged", 1); // failed + Assert.assertEquals("Wrong status in recordingStatusChanged event", "ready", + event.get("status").getAsString()); + Assert.assertEquals("Wrong recording status", Recording.Status.ready, + OV.getRecording(sessionName + "-2").getStatus()); + } checkDockerContainerRunning("openvidu/openvidu-recording", 0); - Assert.assertEquals("Wrong recording status", Recording.Status.failed, - OV.getRecording(sessionName + "-2").getStatus()); - } finally { CustomWebhook.shutDown(); }