github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-03-01 22:00:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

core: Close and join all jobs after each test

Browse Source
This commit is contained in:
Him188 2022-06-08 11:24:26 +01:00
parent 4c6b879873
commit dab703869f
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mirai-core/src/commonTest/kotlin/network/framework/AbstractRealNetworkHandlerTest.kt
View File

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