From 66f0752b5f02176f7b701078f41a2bb8b4f7bcc7 Mon Sep 17 00:00:00 2001 From: pabloFuente Date: Mon, 28 Jan 2019 11:09:30 +0100 Subject: [PATCH] openvidu-server-e2e: recursive jave executable --- .../openvidu/test/e2e/OpenViduTestAppE2eTest.java | 2 +- .../test/e2e/utils/MultimediaFileMetadata.java | 14 ++++++++++++-- 2 files changed, 13 insertions(+), 3 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 b0b5c5d6..9187e528 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 @@ -1770,7 +1770,7 @@ public class OpenViduTestAppE2eTest { int framerate, String videoDecoder, String audioDecoder) { // Check tracks, duration, resolution, framerate and decoders MultimediaFileMetadata metadata = new MultimediaFileMetadata(file); - metadata.processMultimediaFile(); + metadata.processMultimediaFile(0); if (hasVideo) { if (hasAudio) { 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 83a714a2..8c75e797 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 @@ -46,7 +46,7 @@ public class MultimediaFileMetadata { this.f = f; } - public void processMultimediaFile() { + public void processMultimediaFile(int iteration) { try { this.mediaInfo = new MultimediaObject(f).getInfo(); this.audioInfo = mediaInfo.getAudio(); @@ -57,8 +57,19 @@ public class MultimediaFileMetadata { } catch (EncoderException e) { log.error("Error getting multimedia information from file {}. Error: {}", f.getAbsolutePath(), e.getMessage()); + try { + Thread.sleep(1000); + } catch (InterruptedException e1) { + e1.printStackTrace(); + } log.info(System.getProperty("user.name")); this.executeCommand("ls -la /tmp/jave/"); + if (iteration < 5) { + this.processMultimediaFile(iteration++); + } else { + log.error("Couldn't run jave 5 iterations"); + return; + } } } @@ -132,7 +143,6 @@ public class MultimediaFileMetadata { private void executeCommand(String command) { try { - Thread.sleep(500); String s; Process p; p = Runtime.getRuntime().exec(command);