From 1bc1d08b34d0bb0fb8842a1417968395c13763b5 Mon Sep 17 00:00:00 2001
From: "pj.fanning" <pj.fanning@workday.com>
Date: Tue, 14 Mar 2017 01:05:27 +0000
Subject: [issue 443] actor system terminate

---
 kamon-core/src/test/scala/kamon/testkit/BaseKamonSpec.scala | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'kamon-core/src/test/scala/kamon/testkit/BaseKamonSpec.scala')

diff --git a/kamon-core/src/test/scala/kamon/testkit/BaseKamonSpec.scala b/kamon-core/src/test/scala/kamon/testkit/BaseKamonSpec.scala
index a615dde4..995f15fa 100644
--- a/kamon-core/src/test/scala/kamon/testkit/BaseKamonSpec.scala
+++ b/kamon-core/src/test/scala/kamon/testkit/BaseKamonSpec.scala
@@ -19,7 +19,7 @@ package kamon.testkit
 import akka.actor.ActorSystem
 import akka.testkit.{ImplicitSender, TestKitBase}
 import com.typesafe.config.Config
-import kamon.Kamon
+import kamon.{ActorSystemTools, Kamon}
 import kamon.metric.{Entity, EntitySnapshot, SubscriptionsDispatcher}
 import kamon.trace.TraceContext
 import kamon.util.LazyActorRef
@@ -27,7 +27,7 @@ import org.scalatest.{BeforeAndAfterAll, Matchers, WordSpecLike}
 
 abstract class BaseKamonSpec(actorSystemName: String) extends TestKitBase with WordSpecLike with Matchers with ImplicitSender with BeforeAndAfterAll {
   lazy val collectionContext = Kamon.metrics.buildDefaultCollectionContext
-  implicit lazy val system: ActorSystem = {
+  override implicit lazy val system: ActorSystem = {
     Kamon.start(mergedConfig)
     ActorSystem(actorSystemName, mergedConfig)
   }
@@ -65,6 +65,6 @@ abstract class BaseKamonSpec(actorSystemName: String) extends TestKitBase with W
 
   override protected def afterAll(): Unit = {
     Kamon.shutdown()
-    system.shutdown()
+    ActorSystemTools.terminateActorSystem(system)
   }
 }
-- 
cgit v1.2.3