Skip to content

Commit 6ce6fde

Browse files
committed
chore(test): Wait for server to shut down before running new tests
A test in 21d1190 failed because the server from a previous test was already running
1 parent c0c58a0 commit 6ce6fde

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

src/test/kotlin/tech/relaycorp/relaynet/cogrpc/test/TestCogRPCServer.kt

+5
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import io.grpc.Server
55
import io.grpc.netty.NettyServerBuilder
66
import java.net.InetSocketAddress
77
import java.util.concurrent.TimeUnit
8+
import java.util.logging.Logger
89

910
class TestCogRPCServer(
1011
private val host: String,
@@ -13,6 +14,8 @@ class TestCogRPCServer(
1314
) {
1415
private var server: Server? = null
1516

17+
private val logger = Logger.getLogger(TestCogRPCServer::class.java.name)
18+
1619
fun start() {
1720
server = NettyServerBuilder
1821
.forAddress(InetSocketAddress(host, port))
@@ -23,7 +26,9 @@ class TestCogRPCServer(
2326

2427
fun stop() {
2528
if (server?.shutdown()?.awaitTermination(3, TimeUnit.SECONDS) == false) {
29+
logger.info("Forcing test server to shut down")
2630
server?.shutdownNow()
31+
server?.awaitTermination()
2732
}
2833
server = null
2934
}

0 commit comments

Comments
 (0)