Add timeout to shutdown

Add timeout to all shutdown calls in test classes. JIRA: LIGHTY-299 Signed-off-by: Ivan Hrasko <[email protected]>
PANTHEONtech · Oct 31, 2024 · 12196cf · 12196cf
1 parent a80868f
commit 12196cf
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/...-controller-guice-di/src/test/java/io/lighty/core/controller/guice/tests/GuiceDITest.java b/...-controller-guice-di/src/test/java/io/lighty/core/controller/guice/tests/GuiceDITest.java
@@ -18,6 +18,7 @@
 import io.lighty.core.controller.impl.config.ControllerConfiguration;
 import io.lighty.core.controller.impl.util.ControllerConfigUtils;
 import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testng.annotations.AfterClass;
@@ -50,7 +51,7 @@ public void init() throws ExecutionException, InterruptedException, Configuratio
     public void shutdown() {
         try {
             if (lightyController != null) {
-                lightyController.shutdown().get();
+                lightyController.shutdown(60, TimeUnit.SECONDS);
             }
         } catch (Exception e) {
             LOG.error("Shutdown of LightyController failed", e);

diff --git a/...-di/src/test/java/io/lighty/core/controller/spring/LightyCoreSpringConfigurationTest.java b/...-di/src/test/java/io/lighty/core/controller/spring/LightyCoreSpringConfigurationTest.java
@@ -18,6 +18,7 @@
 import io.lighty.core.controller.impl.util.ControllerConfigUtils;
 import java.util.Collections;
 import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
 import org.junit.jupiter.api.Test;
 import org.opendaylight.controller.cluster.ActorSystemProvider;
 import org.opendaylight.controller.cluster.datastore.DistributedDataStoreInterface;
@@ -198,7 +199,7 @@ public LightyController initLightyController() throws LightyLaunchException, Int
         public void shutdownLightyController(LightyController lightyController) throws LightyLaunchException {
             try {
                 LOG.info("Shutting down LightyController ...");
-                lightyController.shutdown().get();
+                lightyController.shutdown(60, TimeUnit.SECONDS);
             } catch (Exception e) {
                 throw new LightyLaunchException("Could not shutdown LightyController", e);
             }

diff --git a/...lighty-aaa-aggregator/lighty-aaa/src/test/java/io/lighty/aaa/ShiroInitializationTest.java b/...lighty-aaa-aggregator/lighty-aaa/src/test/java/io/lighty/aaa/ShiroInitializationTest.java
@@ -18,7 +18,7 @@
 import io.lighty.server.LightyServerBuilder;
 import java.net.InetSocketAddress;
 import java.util.Optional;
-import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.opendaylight.aaa.api.CredentialAuth;
@@ -81,11 +81,11 @@ public void init() {
     }
 
     @AfterMethod
-    public void tearDown() throws ExecutionException, InterruptedException {
+    public void tearDown() {
         if (aaaLighty != null) {
             // Stop the object and ensure that stopping was successful
             assertTrue(aaaLighty.stopProcedure());
-            assertTrue(aaaLighty.shutdown().get());
+            assertTrue(aaaLighty.shutdown(60, TimeUnit.SECONDS));
         }
     }