Skip to content

fix test and a crash when closed #254

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
Jun 15, 2020
+27 −7
Merged

fix test and a crash when closed #254

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a56d5d9
fix test and a crash when closed
artemredkin Jun 15, 2020
b9f23c8
review fixes
artemredkin Jun 15, 2020
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
1 change: 0 additions & 1 deletion Sources/AsyncHTTPClient/ConnectionsState.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,6 @@ extension HTTP1ConnectionProvider {
self.openedConnectionsCount -= 1
return self.processNextWaiter()
case .closed:
assertionFailure("should not happen")
return .none
}
}
Expand Down
1 change: 1 addition & 0 deletions Tests/AsyncHTTPClientTests/ConnectionPoolTests+XCTest.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ extension ConnectionPoolTests {
("testAcquireReplace", testAcquireReplace),
("testAcquireWhenUnavailableSpecificEL", testAcquireWhenUnavailableSpecificEL),
("testAcquireWhenClosed", testAcquireWhenClosed),
("testConnectFailedWhenClosed", testConnectFailedWhenClosed),
("testReleaseAliveConnectionEmptyQueue", testReleaseAliveConnectionEmptyQueue),
("testReleaseAliveButClosingConnectionEmptyQueue", testReleaseAliveButClosingConnectionEmptyQueue),
("testReleaseInactiveConnectionEmptyQueue", testReleaseInactiveConnectionEmptyQueue),
Expand Down
17 changes: 17 additions & 0 deletions Tests/AsyncHTTPClientTests/ConnectionPoolTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,6 +320,23 @@ class ConnectionPoolTests: XCTestCase {
}
}

func testConnectFailedWhenClosed() {
var state = HTTP1ConnectionProvider.ConnectionsState(eventLoop: self.eventLoop)
var snapshot = state.testsOnly_getInternalState()
snapshot.state = .closed
state.testsOnly_setInternalState(snapshot)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can't we achieve this state by driving the state machine rather than forcing in a possibly illegal state?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah, good catch, we can indeed, done, thanks! (also fixed a similar test above)


XCTAssertFalse(state.enqueue())

let action = state.connectFailed()
switch action {
case .none:
break
default:
XCTFail("Unexpected action: \(action)")
}
}

// MARK: - Release Tests

func testReleaseAliveConnectionEmptyQueue() throws {
Expand Down
11 changes: 8 additions & 3 deletions Tests/AsyncHTTPClientTests/HTTPClientInternalTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -797,13 +797,18 @@ class HTTPClientInternalTests: XCTestCase {
}

func testUncleanCloseThrows() {
let httpBin = HTTPBin()
let server = NIOHTTP1TestServer(group: self.clientGroup)
defer {
XCTAssertNoThrow(try httpBin.shutdown())
XCTAssertNoThrow(try server.stop())
}

let httpClient = HTTPClient(eventLoopGroupProvider: .shared(self.clientGroup))

_ = httpClient.get(url: "http://localhost:\(httpBin.port)/wait")
_ = httpClient.get(url: "http://localhost:\(server.serverPort)/wait")

XCTAssertNoThrow(try server.readInbound()) // .head
XCTAssertNoThrow(try server.readInbound()) // .end

do {
try httpClient.syncShutdown(requiresCleanClose: true)
XCTFail("There should be an error on shutdown")
Expand Down