From e5ca6876ae3500543710d4c179ce2761c3cb4087 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Wed, 5 Dec 2018 11:20:21 +0100 Subject: [PATCH] Require FiniteDuration in waitOnAsyncTask() We do not want tests to ever specify an infite duration, make sure we express that in the contract. Change-Id: If0202e6b81761461e0d34ad6a00ea207f8a28e50 Signed-off-by: Robert Varga --- .../controller/cluster/datastore/AbstractTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/AbstractTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/AbstractTest.java index 80c839872b..a3726e270b 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/AbstractTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/AbstractTest.java @@ -23,7 +23,7 @@ import org.opendaylight.controller.cluster.access.concepts.MemberName; import org.opendaylight.controller.cluster.access.concepts.TransactionIdentifier; import scala.compat.java8.FutureConverters; import scala.concurrent.Await; -import scala.concurrent.duration.Duration; +import scala.concurrent.duration.FiniteDuration; public abstract class AbstractTest { protected static final MemberName MEMBER_NAME = MemberName.forName("member-1"); @@ -53,7 +53,7 @@ public abstract class AbstractTest { return new LocalHistoryIdentifier(CLIENT_ID, HISTORY_COUNTER.incrementAndGet()); } - protected static T waitOnAsyncTask(final CompletionStage completionStage, final Duration timeout) + protected static T waitOnAsyncTask(final CompletionStage completionStage, final FiniteDuration timeout) throws Exception { return Await.result(FutureConverters.toScala(completionStage), timeout); } -- 2.36.6