Skip to content

Commit f0947e9

Browse files
committed
Remove duplicate test due too merge conflict
1 parent a9122e8 commit f0947e9

File tree

2 files changed

+0
-68
lines changed

2 files changed

+0
-68
lines changed

Tests/AsyncHTTPClientTests/RequestBagTests+XCTest.swift

-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ extension RequestBagTests {
3535
("testFailsTaskWhenTaskIsWaitingForMoreFromServer", testFailsTaskWhenTaskIsWaitingForMoreFromServer),
3636
("testChannelBecomingWritableDoesntCrashCancelledTask", testChannelBecomingWritableDoesntCrashCancelledTask),
3737
("testDidReceiveBodyPartFailedPromise", testDidReceiveBodyPartFailedPromise),
38-
("testDidReceiveBodyPartFailedPromise", testDidReceiveBodyPartFailedPromise),
3938
("testHTTPUploadIsCancelledEvenThoughRequestSucceeds", testHTTPUploadIsCancelledEvenThoughRequestSucceeds),
4039
("testRaceBetweenConnectionCloseAndDemandMoreData", testRaceBetweenConnectionCloseAndDemandMoreData),
4140
("testRedirectWith3KBBody", testRedirectWith3KBBody),

Tests/AsyncHTTPClientTests/RequestBagTests.swift

-67
Original file line numberDiff line numberDiff line change
@@ -522,73 +522,6 @@ final class RequestBagTests: XCTestCase {
522522
}
523523
}
524524

525-
func testDidReceiveBodyPartFailedPromise() {
526-
let embeddedEventLoop = EmbeddedEventLoop()
527-
defer { XCTAssertNoThrow(try embeddedEventLoop.syncShutdownGracefully()) }
528-
let logger = Logger(label: "test")
529-
530-
var maybeRequest: HTTPClient.Request?
531-
532-
XCTAssertNoThrow(maybeRequest = try HTTPClient.Request(
533-
url: "https://swift.org",
534-
method: .POST,
535-
body: .byteBuffer(.init(bytes: [1]))
536-
))
537-
guard let request = maybeRequest else { return XCTFail("Expected to have a request") }
538-
539-
struct MyError: Error, Equatable {}
540-
final class Delegate: HTTPClientResponseDelegate {
541-
typealias Response = Void
542-
let didFinishPromise: EventLoopPromise<Void>
543-
init(didFinishPromise: EventLoopPromise<Void>) {
544-
self.didFinishPromise = didFinishPromise
545-
}
546-
547-
func didReceiveBodyPart(task: HTTPClient.Task<Void>, _ buffer: ByteBuffer) -> EventLoopFuture<Void> {
548-
task.eventLoop.makeFailedFuture(MyError())
549-
}
550-
551-
func didReceiveError(task: HTTPClient.Task<Void>, _ error: Error) {
552-
self.didFinishPromise.fail(error)
553-
}
554-
555-
func didFinishRequest(task: AsyncHTTPClient.HTTPClient.Task<Void>) throws {
556-
XCTFail("\(#function) should not be called")
557-
self.didFinishPromise.succeed(())
558-
}
559-
}
560-
let delegate = Delegate(didFinishPromise: embeddedEventLoop.makePromise())
561-
var maybeRequestBag: RequestBag<Delegate>?
562-
XCTAssertNoThrow(maybeRequestBag = try RequestBag(
563-
request: request,
564-
eventLoopPreference: .delegate(on: embeddedEventLoop),
565-
task: .init(eventLoop: embeddedEventLoop, logger: logger),
566-
redirectHandler: nil,
567-
connectionDeadline: .now() + .seconds(30),
568-
requestOptions: .forTests(),
569-
delegate: delegate
570-
))
571-
guard let bag = maybeRequestBag else { return XCTFail("Expected to be able to create a request bag.") }
572-
573-
let executor = MockRequestExecutor(eventLoop: embeddedEventLoop)
574-
575-
executor.runRequest(bag)
576-
577-
bag.resumeRequestBodyStream()
578-
XCTAssertNoThrow(try executor.receiveRequestBody { XCTAssertEqual($0, ByteBuffer(bytes: [1])) })
579-
580-
bag.receiveResponseHead(.init(version: .http1_1, status: .ok))
581-
582-
bag.succeedRequest([ByteBuffer([1])])
583-
584-
XCTAssertThrowsError(try delegate.didFinishPromise.futureResult.wait()) { error in
585-
XCTAssertEqualTypeAndValue(error, MyError())
586-
}
587-
XCTAssertThrowsError(try bag.task.futureResult.wait()) { error in
588-
XCTAssertEqualTypeAndValue(error, MyError())
589-
}
590-
}
591-
592525
func testHTTPUploadIsCancelledEvenThoughRequestSucceeds() {
593526
let embeddedEventLoop = EmbeddedEventLoop()
594527
defer { XCTAssertNoThrow(try embeddedEventLoop.syncShutdownGracefully()) }

0 commit comments

Comments
 (0)