From 416901a0c0a9e2850b7fe61c8a5d1a578640cd98 Mon Sep 17 00:00:00 2001 From: Tomas Cere Date: Tue, 14 Sep 2021 14:26:58 +0200 Subject: [PATCH] Increase eos-dom-akka teardown timeouts Looks like the default 10 seconds is not quite enough on releng. Increase the default shutdown timeouts to 20 seconds. Change-Id: I6a5b3bc6822835dd2515cef86de7376162d070bf Signed-off-by: Tomas Cere --- .../controller/eos/akka/AkkaEntityOwnershipServiceTest.java | 2 +- .../org/opendaylight/controller/eos/akka/SingleNodeTest.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/opendaylight/md-sal/eos-dom-akka/src/test/java/org/opendaylight/controller/eos/akka/AkkaEntityOwnershipServiceTest.java b/opendaylight/md-sal/eos-dom-akka/src/test/java/org/opendaylight/controller/eos/akka/AkkaEntityOwnershipServiceTest.java index a444aefcfb..cf456fec75 100644 --- a/opendaylight/md-sal/eos-dom-akka/src/test/java/org/opendaylight/controller/eos/akka/AkkaEntityOwnershipServiceTest.java +++ b/opendaylight/md-sal/eos-dom-akka/src/test/java/org/opendaylight/controller/eos/akka/AkkaEntityOwnershipServiceTest.java @@ -68,7 +68,7 @@ public class AkkaEntityOwnershipServiceTest extends AbstractNativeEosTest { @After public void tearDown() throws InterruptedException, ExecutionException { service.close(); - ActorTestKit.shutdown(Adapter.toTyped(system)); + ActorTestKit.shutdown(Adapter.toTyped(system), Duration.ofSeconds(20)); } @Test diff --git a/opendaylight/md-sal/eos-dom-akka/src/test/java/org/opendaylight/controller/eos/akka/SingleNodeTest.java b/opendaylight/md-sal/eos-dom-akka/src/test/java/org/opendaylight/controller/eos/akka/SingleNodeTest.java index 9b8862bbae..4d04530b10 100644 --- a/opendaylight/md-sal/eos-dom-akka/src/test/java/org/opendaylight/controller/eos/akka/SingleNodeTest.java +++ b/opendaylight/md-sal/eos-dom-akka/src/test/java/org/opendaylight/controller/eos/akka/SingleNodeTest.java @@ -8,6 +8,7 @@ package org.opendaylight.controller.eos.akka; import akka.actor.testkit.typed.javadsl.ActorTestKit; +import java.time.Duration; import java.util.List; import org.junit.After; import org.junit.Before; @@ -28,7 +29,7 @@ public class SingleNodeTest extends AbstractNativeEosTest { @After public void tearDown() { - ActorTestKit.shutdown(clusterNode.getActorSystem()); + ActorTestKit.shutdown(clusterNode.getActorSystem(), Duration.ofSeconds(20)); } @Test -- 2.36.6