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

Fix flaky test #70

Merged
merged 3 commits into from
Feb 4, 2025
Merged

Fix flaky test #70

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bce7efc
Fix flaky test
gjcairo Feb 3, 2025
0f5d940
Fix up test arguments
gjcairo Feb 4, 2025
ca570c6
Merge branch 'main' into fix-flaky-test
glbrntt Feb 4, 2025
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
121 changes: 39 additions & 82 deletions Tests/GRPCNIOTransportHTTP2Tests/HTTP2TransportTLSEnabledTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,8 +229,6 @@ struct HTTP2TransportTLSEnabledTests {
enum TLSEnabledTestsError: Error {
case failedToImportPKCS12
case unexpectedListeningAddress
case serverError(cause: any Error)
case clientError(cause: any Error)
}

struct Config<Transport, Security> {
Expand Down Expand Up @@ -477,98 +475,57 @@ struct HTTP2TransportTLSEnabledTests {
serverConfig: ServerConfig,
_ test: (ControlClient<NIOClientTransport>) async throws -> Void
) async throws {
try await withThrowingDiscardingTaskGroup { group in
let server = self.makeServer(config: serverConfig)

group.addTask {
do {
try await server.serve()
} catch {
throw TLSEnabledTestsError.serverError(cause: error)
}
}
let serverTransport: NIOServerTransport
switch serverConfig {
case .posix(let posix):
serverTransport = NIOServerTransport(
.http2NIOPosix(
address: .ipv4(host: "127.0.0.1", port: 0),
transportSecurity: posix.security,
config: posix.transport
)
)
#if canImport(Network)
case .transportServices(let config):
serverTransport = NIOServerTransport(
.http2NIOTS(
address: .ipv4(host: "127.0.0.1", port: 0),
transportSecurity: config.security,
config: config.transport
)
)
#endif
}

try await withGRPCServer(transport: serverTransport, services: [ControlService()]) { server in
guard let address = try await server.listeningAddress?.ipv4 else {
throw TLSEnabledTestsError.unexpectedListeningAddress
}

let target: any ResolvableTarget = .ipv4(host: address.host, port: address.port)
let client = try self.makeClient(config: clientConfig, target: target)

group.addTask {
do {
try await client.runConnections()
} catch {
throw TLSEnabledTestsError.clientError(cause: error)
}
}

let control = ControlClient(wrapping: client)
try await test(control)

client.beginGracefulShutdown()
server.beginGracefulShutdown()
}
}

private func makeServer(config: ServerConfig) -> GRPCServer<NIOServerTransport> {
let services = [ControlService()]

switch config {
case .posix(let config):
return GRPCServer(
transport: NIOServerTransport(
let clientTransport: NIOClientTransport
switch clientConfig {
case .posix(let config):
clientTransport = try NIOClientTransport(
.http2NIOPosix(
address: .ipv4(host: "127.0.0.1", port: 0),
target: target,
transportSecurity: config.security,
config: config.transport
)
),
services: services
)

#if canImport(Network)
case .transportServices(let config):
return GRPCServer(
transport: NIOServerTransport(
.http2NIOTS(
address: .ipv4(host: "127.0.0.1", port: 0),
transportSecurity: config.security,
config: config.transport
)
),
services: services
)
#endif
}
}

private func makeClient(
config: ClientConfig,
target: any ResolvableTarget
) throws -> GRPCClient<NIOClientTransport> {
switch config {
case .posix(let config):
let transport = try HTTP2ClientTransport.Posix(
target: target,
transportSecurity: config.security,
config: config.transport,
serviceConfig: ServiceConfig()
)
return GRPCClient(transport: NIOClientTransport(transport))
)
#if canImport(Network)
case .transportServices(let config):
clientTransport = try NIOClientTransport(
.http2NIOTS(target: target, transportSecurity: config.security, config: config.transport)
)
#endif
}

#if canImport(Network)
case .transportServices(let config):
let transport = try HTTP2ClientTransport.TransportServices(
target: target,
transportSecurity: config.security,
config: config.transport,
serviceConfig: ServiceConfig()
)
return GRPCClient(transport: NIOClientTransport(transport))
#endif
try await withGRPCClient(transport: clientTransport) { client in
let control = ControlClient(wrapping: client)
try await test(control)
}
}

}

private func executeUnaryRPC(control: ControlClient<NIOClientTransport>) async throws {
Expand Down
Loading