Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Shutdown server gracefully in h2 transport tests #1996

Merged
merged 1 commit into from
Jul 26, 2024
Merged

Shutdown server gracefully in h2 transport tests #1996

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions Tests/GRPCHTTP2TransportTests/HTTP2TransportTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ final class HTTP2TransportTests: XCTestCase {
) async throws {
for pair in transport {
try await withThrowingTaskGroup(of: Void.self) { group in
let address = try await self.runServer(
let (server, address) = try await self.runServer(
in: &group,
kind: pair.server,
enableControlService: enableControlService,
Expand Down Expand Up @@ -94,8 +94,8 @@ final class HTTP2TransportTests: XCTestCase {
XCTFail("Unexpected error: '\(error)' (\(pair))")
}

server.stopListening()
client.close()
group.cancelAll()
}
}
}
Expand Down Expand Up @@ -139,7 +139,7 @@ final class HTTP2TransportTests: XCTestCase {
kind: Transport.Kind,
enableControlService: Bool,
compression: CompressionAlgorithmSet
) async throws -> GRPCHTTP2Core.SocketAddress {
) async throws -> (GRPCServer, GRPCHTTP2Core.SocketAddress) {
let services = enableControlService ? [ControlService()] : []

switch kind {
Expand All @@ -156,7 +156,8 @@ final class HTTP2TransportTests: XCTestCase {
try await server.run()
}

return try await transport.listeningAddress
let address = try await transport.listeningAddress
return (server, address)

case .niots:
#if canImport(Network)
Expand All @@ -172,7 +173,8 @@ final class HTTP2TransportTests: XCTestCase {
try await server.run()
}

return try await transport.listeningAddress
let address = try await transport.listeningAddress
return (server, address)
#else
throw XCTSkip("Transport not supported on this platform")
#endif
Expand Down
Loading