From 1409363dd065969641663ff3a405a7db4b84361f Mon Sep 17 00:00:00 2001 From: pabloFuente Date: Mon, 7 Oct 2019 17:21:58 +0200 Subject: [PATCH] openvidu-server: make KmsManager#postConstruct protected --- .../java/io/openvidu/server/kurento/kms/KmsManager.java | 2 +- .../java/io/openvidu/test/e2e/OpenViduTestAppE2eTest.java | 7 ++++++- .../io/openvidu/test/e2e/utils/MultimediaFileMetadata.java | 2 ++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/openvidu-server/src/main/java/io/openvidu/server/kurento/kms/KmsManager.java b/openvidu-server/src/main/java/io/openvidu/server/kurento/kms/KmsManager.java index 113aa0f6..e6e21b02 100644 --- a/openvidu-server/src/main/java/io/openvidu/server/kurento/kms/KmsManager.java +++ b/openvidu-server/src/main/java/io/openvidu/server/kurento/kms/KmsManager.java @@ -185,7 +185,7 @@ public abstract class KmsManager { throws Exception; @PostConstruct - private void postConstruct() { + protected void postConstruct() { try { List kmsProps = new ArrayList<>(); String kmsId; 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 2a75d2f6..9168d22d 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 @@ -102,9 +102,9 @@ import io.openvidu.test.browsers.ChromeAndroidUser; import io.openvidu.test.browsers.ChromeUser; import io.openvidu.test.browsers.FirefoxUser; import io.openvidu.test.browsers.OperaUser; +import io.openvidu.test.browsers.utils.CommandLineExecutor; import io.openvidu.test.browsers.utils.CustomHttpClient; import io.openvidu.test.browsers.utils.CustomWebhook; -import io.openvidu.test.e2e.utils.CommandLineExecutor; import io.openvidu.test.e2e.utils.MultimediaFileMetadata; import io.openvidu.test.e2e.utils.Unzipper; @@ -3162,6 +3162,11 @@ public class OpenViduTestAppE2eTest { private void restartKms() { this.stopKms(); + try { + Thread.sleep(1000); + } catch (InterruptedException e) { + e.printStackTrace(); + } this.startKms(); } diff --git a/openvidu-test-e2e/src/test/java/io/openvidu/test/e2e/utils/MultimediaFileMetadata.java b/openvidu-test-e2e/src/test/java/io/openvidu/test/e2e/utils/MultimediaFileMetadata.java index 860ae08b..0c73e38c 100644 --- a/openvidu-test-e2e/src/test/java/io/openvidu/test/e2e/utils/MultimediaFileMetadata.java +++ b/openvidu-test-e2e/src/test/java/io/openvidu/test/e2e/utils/MultimediaFileMetadata.java @@ -30,6 +30,8 @@ import com.google.gson.JsonArray; import com.google.gson.JsonObject; import com.google.gson.JsonParser; +import io.openvidu.test.browsers.utils.CommandLineExecutor; + public class MultimediaFileMetadata { private static final Logger log = LoggerFactory.getLogger(MultimediaFileMetadata.class);