mirror
/
swift-nio-transport-services
mirror of https://github.com/apple/swift-nio-transport-services.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Make tests less flaky (#194) 

# Motivation
After the recent changes in NIO where we introduced the `executeThenClose` method on the `NIOAsyncChannel` our tests here became flaky since we were waiting for something to happen but potentially closed the client channels before we wrote out the data.

# Modification
This PR makes sure we are awaiting for the event in the `executeThenClose` scope; hence, making sure we are not closing the client channels too early.

# Result
Less flakey tests.
This commit is contained in:
Franz Busch 2023-12-01 12:57:55 +00:00 committed by GitHub
parent 2f6ba3d83c
commit cb29107d4d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Tests/NIOTransportServicesTests/NIOTSAsyncBootstrapTests.swift
View File

@ -222,10 +222,9 @@ final class AsyncChannelBootstrapTests: XCTestCase {
let stringChannel = try await self.makeClientChannel(eventLoopGroup: eventLoopGroup, port: channel.channel.localAddress!.port!) let stringChannel = try await self.makeClientChannel(eventLoopGroup: eventLoopGroup, port: channel.channel.localAddress!.port!)
try await stringChannel.executeThenClose { _, outbound in try await stringChannel.executeThenClose { _, outbound in
try await outbound.write("hello") try await outbound.write("hello")
await XCTAsyncAssertEqual(await iterator.next(), .string("hello"))
} }
await XCTAsyncAssertEqual(await iterator.next(), .string("hello"))
group.cancelAll() group.cancelAll()
} }
} }
@ -287,8 +286,8 @@ final class AsyncChannelBootstrapTests: XCTestCase {
// This is the actual content // This is the actual content
try await stringChannel.executeThenClose { _, outbound in try await stringChannel.executeThenClose { _, outbound in
try await outbound.write("hello") try await outbound.write("hello")
await XCTAsyncAssertEqual(await serverIterator.next(), .string("hello"))
} }
await XCTAsyncAssertEqual(await serverIterator.next(), .string("hello"))
case .byte: case .byte:
preconditionFailure() preconditionFailure()
} }
@ -305,8 +304,8 @@ final class AsyncChannelBootstrapTests: XCTestCase {
// This is the actual content // This is the actual content
try await byteChannel.executeThenClose { _, outbound in try await byteChannel.executeThenClose { _, outbound in
try await outbound.write(UInt8(8)) try await outbound.write(UInt8(8))
await XCTAsyncAssertEqual(await serverIterator.next(), .byte(8))
} }
await XCTAsyncAssertEqual(await serverIterator.next(), .byte(8))
} }
group.cancelAll() group.cancelAll()
@ -371,8 +370,8 @@ final class AsyncChannelBootstrapTests: XCTestCase {
// This is the actual content // This is the actual content
try await stringChannel.executeThenClose { _, outbound in try await stringChannel.executeThenClose { _, outbound in
try await outbound.write("hello") try await outbound.write("hello")
await XCTAsyncAssertEqual(await serverIterator.next(), .string("hello"))
} }
await XCTAsyncAssertEqual(await serverIterator.next(), .string("hello"))
case .byte: case .byte:
preconditionFailure() preconditionFailure()
} }
@ -388,8 +387,8 @@ final class AsyncChannelBootstrapTests: XCTestCase {
// This is the actual content // This is the actual content
try await stringChannel.executeThenClose { _, outbound in try await stringChannel.executeThenClose { _, outbound in
try await outbound.write("hello") try await outbound.write("hello")
await XCTAsyncAssertEqual(await serverIterator.next(), .string("hello"))
} }
await XCTAsyncAssertEqual(await serverIterator.next(), .string("hello"))
case .byte: case .byte:
preconditionFailure() preconditionFailure()
} }
@ -407,8 +406,8 @@ final class AsyncChannelBootstrapTests: XCTestCase {
// This is the actual content // This is the actual content
try await byteChannel.executeThenClose { _, outbound in try await byteChannel.executeThenClose { _, outbound in
try await outbound.write(UInt8(8)) try await outbound.write(UInt8(8))
await XCTAsyncAssertEqual(await serverIterator.next(), .byte(8))
} }
await XCTAsyncAssertEqual(await serverIterator.next(), .byte(8))
} }
let stringByteNegotiationResult = try await self.makeClientChannelWithNestedProtocolNegotiation( let stringByteNegotiationResult = try await self.makeClientChannelWithNestedProtocolNegotiation(
@ -424,8 +423,8 @@ final class AsyncChannelBootstrapTests: XCTestCase {
// This is the actual content // This is the actual content
try await byteChannel.executeThenClose { _, outbound in try await byteChannel.executeThenClose { _, outbound in
try await outbound.write(UInt8(8)) try await outbound.write(UInt8(8))
await XCTAsyncAssertEqual(await serverIterator.next(), .byte(8))
} }
await XCTAsyncAssertEqual(await serverIterator.next(), .byte(8))
} }
group.cancelAll() group.cancelAll()
@ -522,8 +521,8 @@ final class AsyncChannelBootstrapTests: XCTestCase {
// This is the actual content // This is the actual content
try await stringChannel.executeThenClose { _, outbound in try await stringChannel.executeThenClose { _, outbound in
try await outbound.write("hello") try await outbound.write("hello")
await XCTAsyncAssertEqual(await serverIterator.next(), .string("hello"))
} }
await XCTAsyncAssertEqual(await serverIterator.next(), .string("hello"))
case .byte: case .byte:
preconditionFailure() preconditionFailure()
} }