X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2FAbstractActorTest.java;h=7c2255e962e522d94382bfd4b35fe8383061b4fd;hb=refs%2Fchanges%2F22%2F65622%2F11;hp=45ef32f7ad798ad15a0840c1c7860bf61f34913d;hpb=f78020d87663c8d9db1e4e33939f7b8b703703f8;p=controller.git

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/AbstractActorTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/AbstractActorTest.java
index 45ef32f7ad..7c2255e962 100644
--- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/AbstractActorTest.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/AbstractActorTest.java
@@ -9,26 +9,27 @@
 package org.opendaylight.controller.cluster.datastore;
 
 import akka.actor.ActorSystem;
-import akka.testkit.JavaTestKit;
+import akka.testkit.javadsl.TestKit;
+import java.io.IOException;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 
-public abstract class AbstractActorTest {
-  private static ActorSystem system;
+public abstract class AbstractActorTest extends AbstractTest {
+    private static ActorSystem system;
 
-  @BeforeClass
-  public static void setUpClass(){
-    system = ActorSystem.create("test");
-  }
+    @BeforeClass
+    public static void setUpClass() throws IOException {
+        System.setProperty("shard.persistent", "false");
+        system = ActorSystem.create("test");
+    }
 
-  @AfterClass
-  public static void tearDownClass(){
-    JavaTestKit.shutdownActorSystem(system);
-    system = null;
-  }
-
-  protected ActorSystem getSystem(){
-    return system;
-  }
+    @AfterClass
+    public static void tearDownClass() throws IOException {
+        TestKit.shutdownActorSystem(system);
+        system = null;
+    }
 
+    protected static ActorSystem getSystem() {
+        return system;
+    }
 }