From dab703869ffbbc53d70d3bd3076a747aca8beb11 Mon Sep 17 00:00:00 2001
From: Him188 <Him188@mamoe.net>
Date: Wed, 8 Jun 2022 11:24:26 +0100
Subject: [PATCH] core: Close and join all jobs after each test

---
 .../network/framework/AbstractRealNetworkHandlerTest.kt      | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/mirai-core/src/commonTest/kotlin/network/framework/AbstractRealNetworkHandlerTest.kt b/mirai-core/src/commonTest/kotlin/network/framework/AbstractRealNetworkHandlerTest.kt
index 5bd6b0cee..94cff788b 100644
--- a/mirai-core/src/commonTest/kotlin/network/framework/AbstractRealNetworkHandlerTest.kt
+++ b/mirai-core/src/commonTest/kotlin/network/framework/AbstractRealNetworkHandlerTest.kt
@@ -28,6 +28,7 @@ import net.mamoe.mirai.internal.network.handler.*
 import net.mamoe.mirai.internal.network.handler.NetworkHandler.State
 import net.mamoe.mirai.internal.network.protocol.data.jce.SvcRespRegister
 import net.mamoe.mirai.internal.network.protocol.packet.login.StatSvc
+import net.mamoe.mirai.internal.test.runBlockingUnit
 import net.mamoe.mirai.internal.utils.subLogger
 import net.mamoe.mirai.utils.*
 import network.framework.components.TestEventDispatcherImpl
@@ -58,7 +59,9 @@ internal abstract class AbstractRealNetworkHandlerTest<H : NetworkHandler> : Abs
 
     @AfterTest
     fun afterEach() {
+        println("Test finished, closing Bot")
         if (botInit) bot.close()
+        runBlockingUnit { bot.join() }
     }
 
     protected open fun createBot(account: BotAccount = MockAccount): QQAndroidBot {
@@ -94,6 +97,8 @@ internal abstract class AbstractRealNetworkHandlerTest<H : NetworkHandler> : Abs
     @AfterTest
     private fun cancelJob() {
         eventDispatcherJob.cancel()
+        println("Test finished, joining eventDispatcherJob")
+        runBlockingUnit { eventDispatcherJob.join() }
     }
 
     /**