Skip to content
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
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
11 changes: 8 additions & 3 deletions Tests/AsyncHTTPClientTests/RequestBagTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -961,13 +961,18 @@ class UploadCountingDelegate: HTTPClientResponseDelegate {
}
}

class MockTaskQueuer: HTTPRequestScheduler {
final class MockTaskQueuer: HTTPRequestScheduler {
private(set) var hitCancelCount = 0

init() {}
let onCancelRequest: (@Sendable (HTTPSchedulableRequest) -> Void)?

func cancelRequest(_: HTTPSchedulableRequest) {
init(onCancelRequest: (@Sendable (HTTPSchedulableRequest) -> Void)? = nil) {
self.onCancelRequest = onCancelRequest
}

func cancelRequest(_ request: HTTPSchedulableRequest) {
self.hitCancelCount += 1
self.onCancelRequest?(request)
}
}

Expand Down
13 changes: 10 additions & 3 deletions Tests/AsyncHTTPClientTests/TransactionTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -43,19 +43,26 @@ final class TransactionTests: XCTestCase {
preferredEventLoop: embeddedEventLoop
)

let queuer = MockTaskQueuer()
let scheduledRequestCanceled = self.expectation(description: "scheduled request canceled")
let queuer = MockTaskQueuer { _ in
scheduledRequestCanceled.fulfill()
}
transaction.requestWasQueued(queuer)

XCTAssertEqual(queuer.hitCancelCount, 0)
Task.detached {
try await Task.sleep(nanoseconds: 5 * 1000 * 1000)
transaction.cancel()
}

XCTAssertEqual(queuer.hitCancelCount, 0)
await XCTAssertThrowsError(try await responseTask.value) { error in
XCTAssertTrue(error is CancellationError, "unexpected error \(error)")
}
XCTAssertEqual(queuer.hitCancelCount, 1)

// self.fulfillment(of:) is not available on Linux
_ = {
self.wait(for: [scheduledRequestCanceled], timeout: 1)
}()
}
}

Expand Down