From 54c68a61c071530930f898ac45f960ab4f4021bf Mon Sep 17 00:00:00 2001 From: andsel Date: Wed, 30 Sep 2015 22:12:36 +0200 Subject: [PATCH] Added timeout check during shutdown of MapDB storage --- .../moquette/spi/persistence/MapDBPersistentStoreTest.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/broker/src/test/java/org/eclipse/moquette/spi/persistence/MapDBPersistentStoreTest.java b/broker/src/test/java/org/eclipse/moquette/spi/persistence/MapDBPersistentStoreTest.java index ba3d5ec9..4977854a 100644 --- a/broker/src/test/java/org/eclipse/moquette/spi/persistence/MapDBPersistentStoreTest.java +++ b/broker/src/test/java/org/eclipse/moquette/spi/persistence/MapDBPersistentStoreTest.java @@ -24,6 +24,7 @@ import org.junit.Test; import java.io.File; import java.util.List; +import java.util.concurrent.TimeUnit; import static org.eclipse.moquette.commons.Constants.DEFAULT_PERSISTENT_PATH; import static org.junit.Assert.*; @@ -104,10 +105,12 @@ public class MapDBPersistentStoreTest { } @Test - public void testCloseShutdownCommitTask() { + public void testCloseShutdownCommitTask() throws InterruptedException { m_storageService.close(); //verify the executor is shutdown + assertTrue("Storage service scheduler can't be stopped in 3 seconds", + m_storageService.m_scheduler.awaitTermination(3, TimeUnit.SECONDS)); assertTrue(m_storageService.m_scheduler.isTerminated()); } } \ No newline at end of file