Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "A bunch of miscellaneous services to get Distributed Data Store ready for...
[controller.git]
/
opendaylight
/
md-sal
/
sal-distributed-datastore
/
src
/
test
/
java
/
org
/
opendaylight
/
controller
/
cluster
/
datastore
/
AbstractActorTest.java
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 ed928ec29c1e61b4be2daf1aa11db68c3b4bd512..214b3e9d3d989d73d0cd618db937a0fa6bcfdcb6 100644
(file)
--- 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
@@
-13,22
+13,23
@@
import akka.testkit.JavaTestKit;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.AfterClass;
import org.junit.BeforeClass;
-public class AbstractActorTest {
- private static ActorSystem system;
+public
abstract
class AbstractActorTest {
+
private static ActorSystem system;
- @BeforeClass
- public static void setUp(){
- system = ActorSystem.create("test");
- }
+ @BeforeClass
+ public static void setUpClass() {
+ System.setProperty("shard.persistent", "false");
+ system = ActorSystem.create("test");
+ }
- @AfterClass
-
public static void tearDown()
{
- JavaTestKit.shutdownActorSystem(system);
- system = null;
- }
+
@AfterClass
+
public static void tearDownClass()
{
+
JavaTestKit.shutdownActorSystem(system);
+
system = null;
+
}
-
protected ActorSystem getSystem()
{
- return system;
- }
+
protected ActorSystem getSystem()
{
+
return system;
+
}
}
}