Skip to content

Enable strict concurrency checking for NIOTestUtils #3130

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
rnro merged 3 commits into from
Mar 7, 2025
Merged

Enable strict concurrency checking for NIOTestUtils #3130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bdc82eb
Enable strict concurrency checking for NIOTestUtils
rnro Mar 6, 2025
ddef495
NIOHTTP1TestServer fatalErrors on channel init failure
rnro Mar 7, 2025
8d4bf2d
Merge branch 'main' into strict_concurrency_niotestutils
rnro Mar 7, 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
3 changes: 2 additions & 1 deletion Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,8 @@ let package = Package(
"NIOEmbedded",
"NIOHTTP1",
swiftAtomics,
]
],
swiftSettings: strictConcurrencySettings
),
.target(
name: "_NIOFileSystem",
Expand Down
18 changes: 8 additions & 10 deletions Sources/NIOTestUtils/NIOHTTP1TestServer.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,18 +263,16 @@ public final class NIOHTTP1TestServer {
self.handleChannels()
return
}
channel.pipeline.configureHTTPServerPipeline().flatMap {
do {
try channel.pipeline.syncOperations.configureHTTPServerPipeline()
if self.aggregateBody {
return channel.pipeline.addHandler(AggregateBodyHandler())
} else {
return self.eventLoop.makeSucceededVoidFuture()
try channel.pipeline.syncOperations.addHandler(AggregateBodyHandler())
}
}.flatMap {
channel.pipeline.addHandler(WebServerHandler(webServer: self))
}.flatMap {
channel.pipeline.addHandler(TransformerHandler())
}.whenSuccess {
_ = channel.setOption(.autoRead, value: true)
try channel.pipeline.syncOperations.addHandler(WebServerHandler(webServer: self))
try channel.pipeline.syncOperations.addHandler(TransformerHandler())
_ = try channel.syncOptions!.setOption(.autoRead, value: true)
} catch {
fatalError("Channel initialization failed with: \(error)")
}
}

Expand Down