Skip to content

Strict concurrency for tests #198

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

Merged
glbrntt merged 4 commits into from
Mar 31, 2025
Merged

Strict concurrency for tests #198

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3938254
Strict concurrency for tests
glbrntt Mar 21, 2025
812ed50
Merge branch 'main' into strict-concurrency-tests
glbrntt Mar 31, 2025
9c97c83
Update Tests/NIOSSHTests/ChildChannelMultiplexerTests.swift
glbrntt Mar 31, 2025
db53940
dont use sync operations where unnecessary
glbrntt Mar 31, 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
Prev Previous commit
dont use sync operations where unnecessary
  • Loading branch information
@glbrntt
glbrntt committed Mar 31, 2025
commit db53940e65d2dd313f87ba6ffe0457aecf3794ce
32 changes: 9 additions & 23 deletions Tests/NIOSSHTests/ChildChannelMultiplexerTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -896,13 +896,8 @@ final class ChildChannelMultiplexerTests: XCTestCase {
// Issue a write to the child.
var bytes = channel.allocator.buffer(capacity: 1024)
bytes.writeString("Hello from the unit tests")

let writePromise = channel.eventLoop.makePromise(of: Void.self)
channel.pipeline.syncOperations.writeAndFlush(
NIOAny(SSHChannelData(type: .channel, data: .byteBuffer(bytes))),
promise: writePromise
)
XCTAssertThrowsError(try writePromise.futureResult.wait()) { error in
XCTAssertThrowsError(try channel.writeAndFlush(SSHChannelData(type: .channel, data: .byteBuffer(bytes))).wait())
{ error in
XCTAssertEqual(error as? ChannelError, .ioOnClosedChannel)
}

Expand Down Expand Up @@ -1050,23 +1045,15 @@ final class ChildChannelMultiplexerTests: XCTestCase {
buffer.writeString("Hello from the unit tests!")

for _ in 0..<5 {
channel.pipeline.syncOperations.write(
NIOAny(SSHChannelData(type: .channel, data: .byteBuffer(buffer))),
promise: nil
)
channel.pipeline.write(SSHChannelData(type: .channel, data: .byteBuffer(buffer)), promise: nil)
}

// Now we're going to add a final write: this will have a write promise. It should complete before
// the close promise does.
let finalWriteComplete = NIOLoopBoundBox(false, eventLoop: channel.eventLoop)
let eofComplete = NIOLoopBoundBox(false, eventLoop: channel.eventLoop)

let writePromise = channel.eventLoop.makePromise(of: Void.self)
channel.pipeline.syncOperations.write(
NIOAny(SSHChannelData(type: .channel, data: .byteBuffer(buffer))),
promise: writePromise
)
writePromise.futureResult.whenSuccess {
channel.write(SSHChannelData(type: .channel, data: .byteBuffer(buffer))).whenSuccess {
XCTAssertFalse(eofComplete.value)
XCTAssertFalse(inactiveRecorder.value.seenInactive)
finalWriteComplete.value = true
Expand Down Expand Up @@ -1126,12 +1113,11 @@ final class ChildChannelMultiplexerTests: XCTestCase {
XCTAssertTrue(channel.isActive)

// Now write some data. This fails immediately.
let writePromise = channel.eventLoop.makePromise(of: Void.self)
channel.pipeline.syncOperations.write(
NIOAny(SSHChannelData(type: .channel, data: .byteBuffer(channel.allocator.buffer(capacity: 1024)))),
promise: writePromise
)
XCTAssertThrowsError(try writePromise.futureResult.wait()) { error in
XCTAssertThrowsError(
try channel.write(
SSHChannelData(type: .channel, data: .byteBuffer(channel.allocator.buffer(capacity: 1024)))
).wait()
) { error in
XCTAssertEqual(error as? ChannelError, .outputClosed)
}
}
Expand Down