Skip to content

Fix flaky tests in HTTPClientSOCKSTests #498

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
Nov 25, 2021
Merged

Fix flaky tests in HTTPClientSOCKSTests #498

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
bc3952a
bind to a port defined by the operating system
dnadoba Nov 25, 2021
2b54600
run SwiftFormat
dnadoba Nov 25, 2021
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
4 changes: 2 additions & 2 deletions Tests/AsyncHTTPClientTests/HTTPClient+SOCKSTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ class HTTPClientSOCKSTests: XCTestCase {
func testProxySOCKS() throws {
let socksBin = try MockSOCKSServer(expectedURL: "/socks/test", expectedResponse: "it works!")
let localClient = HTTPClient(eventLoopGroupProvider: .shared(self.clientGroup),
configuration: .init(proxy: .socksServer(host: "localhost")))
configuration: .init(proxy: .socksServer(host: "localhost", port: socksBin.port)))

defer {
XCTAssertNoThrow(try localClient.syncShutdown())
Expand Down Expand Up @@ -125,7 +125,7 @@ class HTTPClientSOCKSTests: XCTestCase {
func testProxySOCKSMisbehavingServer() throws {
let socksBin = try MockSOCKSServer(expectedURL: "/socks/test", expectedResponse: "it works!", misbehave: true)
let localClient = HTTPClient(eventLoopGroupProvider: .shared(self.clientGroup),
configuration: .init(proxy: .socksServer(host: "localhost")))
configuration: .init(proxy: .socksServer(host: "localhost", port: socksBin.port)))

defer {
XCTAssertNoThrow(try localClient.syncShutdown())
Expand Down
6 changes: 5 additions & 1 deletion Tests/AsyncHTTPClientTests/SOCKSTestUtils.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,10 @@ class TestSOCKSBadServerHandler: ChannelInboundHandler {
class MockSOCKSServer {
let channel: Channel

var port: Int {
self.channel.localAddress!.port!
}

init(expectedURL: String, expectedResponse: String, misbehave: Bool = false, file: String = #file, line: UInt = #line) throws {
let elg = MultiThreadedEventLoopGroup(numberOfThreads: 1)
let bootstrap: ServerBootstrap
Expand All @@ -57,7 +61,7 @@ class MockSOCKSServer {
])
}
}
self.channel = try bootstrap.bind(host: "localhost", port: 1080).wait()
self.channel = try bootstrap.bind(host: "localhost", port: 0).wait()
}

func shutdown() throws {
Expand Down