dnrops
/
swift-nio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HTTP server upgrade tests: cosmetic improvements (#1763) 

Motivation:

The HTTP server upgrade tests had unncessarily wide and also verbose
test assertions.

Modifications:

Rewrote them much simpler and narrowed what states are allowed.

Result:

- Neater code
- Works around https://bugs.swift.org/browse/SR-14253
This commit is contained in:
Johannes Weiss 2021-02-23 15:34:37 +00:00 committed by GitHub
parent 9451f4ac6f
commit de3c2dba50
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Tests/NIOHTTP1Tests/HTTPServerUpgradeTests.swift
View File

@ -866,14 +866,7 @@ class HTTPServerUpgradeTestCase: XCTestCase {
let channel = EmbeddedChannel()
defer {
do {
let complete = try channel.finish()
XCTAssertTrue(complete.isClean)
} catch No.no {
// ok
} catch {
XCTFail("Unexpected error: \(error)")
}
XCTAssertTrue(try channel.finish().isClean)
}
var upgradingProtocol = ""
@ -930,14 +923,7 @@ class HTTPServerUpgradeTestCase: XCTestCase {
let channel = EmbeddedChannel()
defer {
do {
let isCleanOnFinish = try channel.finish().isClean
XCTAssertTrue(isCleanOnFinish)
} catch No.no {
// ok
} catch {
XCTFail("Unexpected error: \(error)")
}
XCTAssertTrue(try channel.finish().isClean)
}
var upgradeRequested = false
@ -996,14 +982,7 @@ class HTTPServerUpgradeTestCase: XCTestCase {
let channel = EmbeddedChannel()
defer {
do {
let isCleanOnFinish = try channel.finish().isClean
XCTAssertTrue(isCleanOnFinish)
} catch No.no {
// ok
} catch {
XCTFail("Unexpected error: \(error)")
}
XCTAssertTrue(try channel.finish().isClean)
}
var upgradeRequested = false