Skip to content

Make isolated execute on async testing eventloop actually run #3116

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
merged 2 commits into from
Feb 18, 2025
Merged

Make isolated execute on async testing eventloop actually run #3116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2ce3bd7
Make isolated execute on async testing eventloop actually run
Lukasa Feb 13, 2025
8c9adb3
Merge branch 'main' into cb-fix-async-event-loop-isolated
glbrntt Feb 18, 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 Sources/NIOEmbedded/AsyncTestingEventLoop.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,8 @@ public final class NIOAsyncTestingEventLoop: EventLoop, @unchecked Sendable {
task: {
do {
// UnsafeUnchecked is acceptable because we know we're in the loop here.
promise?.assumeIsolatedUnsafeUnchecked().succeed(try task())
let result = try task()
promise?.assumeIsolatedUnsafeUnchecked().succeed(result)
} catch let err {
promise?.fail(err)
}
Expand Down
4 changes: 3 additions & 1 deletion Tests/NIOPosixTests/EventLoopFutureIsolatedTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,13 +331,15 @@ final class EventLoopFutureIsolatedTest: XCTestCase {
func _eventLoopIsolated(loop: any EventLoop) throws {
let f = loop.flatSubmit {
let value = SuperNotSendable()
value.x = 4

// Again, all of these need to close over value. In addition,
// many need to return it as well.
let isolated = loop.assumeIsolated()
XCTAssertIdentical(isolated.nonisolated(), loop)
isolated.execute {
XCTAssertEqual(value.x, 5)
XCTAssertEqual(value.x, 4)
value.x = 5
}
let firstFuture = isolated.submit {
let val = SuperNotSendable()
Expand Down
Loading