From 83a71e41ab58d33708c96576b69a41ca8a8ab7ca Mon Sep 17 00:00:00 2001
From: pabloFuente <pablofuenteperez@gmail.com>
Date: Sun, 31 Oct 2021 15:36:00 +0100
Subject: [PATCH] Jenkinsfile: do not remove stranded containers at finally

---
 openvidu-test-e2e/jenkins/Jenkinsfile                |  1 -
 .../test/e2e/AbstractOpenViduTestAppE2eTest.java     | 12 ++++--------
 .../io/openvidu/test/e2e/OpenViduTestAppE2eTest.java | 11 +----------
 3 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/openvidu-test-e2e/jenkins/Jenkinsfile b/openvidu-test-e2e/jenkins/Jenkinsfile
index 6700c389..70e4083f 100644
--- a/openvidu-test-e2e/jenkins/Jenkinsfile
+++ b/openvidu-test-e2e/jenkins/Jenkinsfile
@@ -165,7 +165,6 @@ node('container') {
             currentBuild.result = 'FAILURE'
           } finally {
             environmentStop()
-            commonFunctions.removeStrandedContainers()
           }
         }
       }
diff --git a/openvidu-test-e2e/src/test/java/io/openvidu/test/e2e/AbstractOpenViduTestAppE2eTest.java b/openvidu-test-e2e/src/test/java/io/openvidu/test/e2e/AbstractOpenViduTestAppE2eTest.java
index 5ffdc3f8..8c3a7c0d 100644
--- a/openvidu-test-e2e/src/test/java/io/openvidu/test/e2e/AbstractOpenViduTestAppE2eTest.java
+++ b/openvidu-test-e2e/src/test/java/io/openvidu/test/e2e/AbstractOpenViduTestAppE2eTest.java
@@ -269,16 +269,14 @@ public class AbstractOpenViduTestAppE2eTest {
 	protected void closeAllSessions(OpenVidu client) {
 		try {
 			client.fetch();
-		} catch (OpenViduJavaClientException | OpenViduHttpException e1) {
-			log.error("Error fetching sessions: {}", e1.getMessage());
+		} catch (OpenViduJavaClientException | OpenViduHttpException e) {
+			log.error("Error fetching sessions: {}", e.getMessage());
 		}
 		client.getActiveSessions().forEach(session -> {
 			try {
 				session.close();
 				log.info("Session {} successfully closed", session.getSessionId());
-			} catch (OpenViduJavaClientException e) {
-				log.error("Error closing session: {}", e.getMessage());
-			} catch (OpenViduHttpException e) {
+			} catch (OpenViduJavaClientException | OpenViduHttpException e) {
 				log.error("Error closing session: {}", e.getMessage());
 			}
 		});
@@ -290,9 +288,7 @@ public class AbstractOpenViduTestAppE2eTest {
 				try {
 					client.deleteRecording(recording.getId());
 					log.info("Recording {} successfully deleted", recording.getId());
-				} catch (OpenViduJavaClientException e) {
-					log.error("Error deleting recording: {}", e.getMessage());
-				} catch (OpenViduHttpException e) {
+				} catch (OpenViduJavaClientException | OpenViduHttpException e) {
 					log.error("Error deleting recording: {}", e.getMessage());
 				}
 			});
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 b2f967cf..1bfff025 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
@@ -190,8 +190,6 @@ public class OpenViduTestAppE2eTest extends AbstractOpenViduTestAppE2eTest {
 		user.getEventManager().waitUntilEventReaches("streamCreated", 4);
 		user.getEventManager().waitUntilEventReaches("streamPlaying", 4);
 
-		System.out.println(this.getBase64Screenshot(user));
-
 		final int numberOfVideos = user.getDriver().findElements(By.tagName("video")).size();
 		Assert.assertEquals("Expected 4 videos but found " + numberOfVideos, 4, numberOfVideos);
 		Assert.assertTrue("Videos were expected to only have audio tracks", user.getEventManager()
@@ -1925,7 +1923,6 @@ public class OpenViduTestAppE2eTest extends AbstractOpenViduTestAppE2eTest {
 		user.getDriver().findElement(By.id("get-session-btn")).click();
 
 		Thread.sleep(1000);
-		System.out.println(getBase64Screenshot(user));
 		System.out.println(user.getDriver().findElement(By.id("api-response-text-area")).getAttribute("value"));
 
 		user.getWaiter()
@@ -3336,7 +3333,7 @@ public class OpenViduTestAppE2eTest extends AbstractOpenViduTestAppE2eTest {
 
 	@Test
 	@DisplayName("Media server reconnect active session no streams test")
-	void mediaServerReconnectActiveSessionNoSteamsTest() throws Exception {
+	void mediaServerReconnectActiveSessionNoStreamsTest() throws Exception {
 		isKurentoRestartTest = true;
 
 		log.info("Media server reconnect active session no streams test");
@@ -3433,12 +3430,6 @@ public class OpenViduTestAppE2eTest extends AbstractOpenViduTestAppE2eTest {
 			user.getEventManager().waitUntilEventReaches("streamCreated", 2);
 			user.getEventManager().waitUntilEventReaches("streamPlaying", 2);
 
-			this.closeAllSessions(OV);
-			CustomWebhook.waitForEvent("sessionDestroyed", 2);
-			user.getDriver().findElement(By.id("remove-all-users-btn")).click();
-			user.getEventManager().clearAllCurrentEvents();
-			CustomWebhook.clean();
-
 		} finally {
 			CustomWebhook.shutDown();
 		}