From 9ad8b2e99700e8154920eaf69cd2f195cb40e390 Mon Sep 17 00:00:00 2001 From: Patrik Nordwall Date: Fri, 20 Jan 2017 11:35:56 +0100 Subject: [PATCH] Don't shutdown ActorSystem in tests * changes due to new coordinated shutdown behavior --- .../src/test/resources/reference.conf | 4 ++++ .../src/test/resources/reference.conf | 4 ++++ .../src/test/resources/reference.conf | 4 ++++ .../src/test/resources/reference.conf | 4 ++++ .../src/test/resources/reference.conf | 4 ++++ .../akka-sample-remote-java/src/test/resources/reference.conf | 4 ++++ .../src/test/resources/reference.conf | 4 ++++ 7 files changed, 28 insertions(+) create mode 100644 akka-samples/akka-sample-cluster-java/src/test/resources/reference.conf create mode 100644 akka-samples/akka-sample-cluster-scala/src/test/resources/reference.conf create mode 100644 akka-samples/akka-sample-distributed-data-java/src/test/resources/reference.conf create mode 100644 akka-samples/akka-sample-distributed-data-scala/src/test/resources/reference.conf create mode 100644 akka-samples/akka-sample-multi-node-scala/src/test/resources/reference.conf create mode 100644 akka-samples/akka-sample-remote-java/src/test/resources/reference.conf create mode 100644 akka-samples/akka-sample-remote-scala/src/test/resources/reference.conf diff --git a/akka-samples/akka-sample-cluster-java/src/test/resources/reference.conf b/akka-samples/akka-sample-cluster-java/src/test/resources/reference.conf new file mode 100644 index 0000000000..90492329b7 --- /dev/null +++ b/akka-samples/akka-sample-cluster-java/src/test/resources/reference.conf @@ -0,0 +1,4 @@ +# Don't terminate ActorSystem in tests +akka.coordinated-shutdown.run-by-jvm-shutdown-hook = off +akka.coordinated-shutdown.terminate-actor-system = off +akka.cluster.run-coordinated-shutdown-when-down = off diff --git a/akka-samples/akka-sample-cluster-scala/src/test/resources/reference.conf b/akka-samples/akka-sample-cluster-scala/src/test/resources/reference.conf new file mode 100644 index 0000000000..90492329b7 --- /dev/null +++ b/akka-samples/akka-sample-cluster-scala/src/test/resources/reference.conf @@ -0,0 +1,4 @@ +# Don't terminate ActorSystem in tests +akka.coordinated-shutdown.run-by-jvm-shutdown-hook = off +akka.coordinated-shutdown.terminate-actor-system = off +akka.cluster.run-coordinated-shutdown-when-down = off diff --git a/akka-samples/akka-sample-distributed-data-java/src/test/resources/reference.conf b/akka-samples/akka-sample-distributed-data-java/src/test/resources/reference.conf new file mode 100644 index 0000000000..90492329b7 --- /dev/null +++ b/akka-samples/akka-sample-distributed-data-java/src/test/resources/reference.conf @@ -0,0 +1,4 @@ +# Don't terminate ActorSystem in tests +akka.coordinated-shutdown.run-by-jvm-shutdown-hook = off +akka.coordinated-shutdown.terminate-actor-system = off +akka.cluster.run-coordinated-shutdown-when-down = off diff --git a/akka-samples/akka-sample-distributed-data-scala/src/test/resources/reference.conf b/akka-samples/akka-sample-distributed-data-scala/src/test/resources/reference.conf new file mode 100644 index 0000000000..90492329b7 --- /dev/null +++ b/akka-samples/akka-sample-distributed-data-scala/src/test/resources/reference.conf @@ -0,0 +1,4 @@ +# Don't terminate ActorSystem in tests +akka.coordinated-shutdown.run-by-jvm-shutdown-hook = off +akka.coordinated-shutdown.terminate-actor-system = off +akka.cluster.run-coordinated-shutdown-when-down = off diff --git a/akka-samples/akka-sample-multi-node-scala/src/test/resources/reference.conf b/akka-samples/akka-sample-multi-node-scala/src/test/resources/reference.conf new file mode 100644 index 0000000000..90492329b7 --- /dev/null +++ b/akka-samples/akka-sample-multi-node-scala/src/test/resources/reference.conf @@ -0,0 +1,4 @@ +# Don't terminate ActorSystem in tests +akka.coordinated-shutdown.run-by-jvm-shutdown-hook = off +akka.coordinated-shutdown.terminate-actor-system = off +akka.cluster.run-coordinated-shutdown-when-down = off diff --git a/akka-samples/akka-sample-remote-java/src/test/resources/reference.conf b/akka-samples/akka-sample-remote-java/src/test/resources/reference.conf new file mode 100644 index 0000000000..90492329b7 --- /dev/null +++ b/akka-samples/akka-sample-remote-java/src/test/resources/reference.conf @@ -0,0 +1,4 @@ +# Don't terminate ActorSystem in tests +akka.coordinated-shutdown.run-by-jvm-shutdown-hook = off +akka.coordinated-shutdown.terminate-actor-system = off +akka.cluster.run-coordinated-shutdown-when-down = off diff --git a/akka-samples/akka-sample-remote-scala/src/test/resources/reference.conf b/akka-samples/akka-sample-remote-scala/src/test/resources/reference.conf new file mode 100644 index 0000000000..90492329b7 --- /dev/null +++ b/akka-samples/akka-sample-remote-scala/src/test/resources/reference.conf @@ -0,0 +1,4 @@ +# Don't terminate ActorSystem in tests +akka.coordinated-shutdown.run-by-jvm-shutdown-hook = off +akka.coordinated-shutdown.terminate-actor-system = off +akka.cluster.run-coordinated-shutdown-when-down = off