Skip to content

Commit 8e273f8

Browse files
committed
Fix tests on nghttp2-1.34.0
Motivation: nghttp2 changed the error code it returns when the server sends a GOAWAY. It's now `.cancelled` instead of `.refusedStream`. Modifications: Don't require a specific error code in the tests, just require that an error matching the expected stream ID occurred. Result: Tests will pass on nghttp2-1.34.0.
1 parent 83d27d1 commit 8e273f8

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

Tests/NIOHTTP2Tests/SimpleClientServerTests.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -966,8 +966,8 @@ class SimpleClientServerTests: XCTestCase {
966966
self.interactInMemory(self.clientChannel, self.serverChannel)
967967
try self.clientChannel.assertReceivedFrame().assertGoAwayFrame(lastStreamID: 0, errorCode: UInt32(http2ErrorCode: HTTP2ErrorCode.inadequateSecurity), opaqueData: nil)
968968

969-
// The data frame write should have exploded. nghttp2 synthesises a "refusedStream" error code for this.
970-
XCTAssertEqual(writeError as? NIOHTTP2Errors.StreamClosed, NIOHTTP2Errors.StreamClosed(streamID: clientStreamID, errorCode: .refusedStream))
969+
// The data frame write should have exploded. nghttp2 synthesises an error code for this.
970+
XCTAssertEqual((writeError as? NIOHTTP2Errors.StreamClosed)?.streamID, clientStreamID)
971971

972972
// No other frames should be emitted.
973973
self.clientChannel.assertNoFramesReceived()
@@ -1170,8 +1170,8 @@ class SimpleClientServerTests: XCTestCase {
11701170
// Now the streams are closed, they should have seen user events.
11711171
XCTAssertEqual(clientHandler.events.count, 1)
11721172
XCTAssertEqual(serverHandler.events.count, 1)
1173-
XCTAssertEqual(clientHandler.events[0] as? StreamClosedEvent, StreamClosedEvent(streamID: clientStreamID, reason: .refusedStream))
1174-
XCTAssertEqual(serverHandler.events[0] as? StreamClosedEvent, StreamClosedEvent(streamID: serverStreamID, reason: .refusedStream))
1173+
XCTAssertEqual((clientHandler.events[0] as? StreamClosedEvent)?.streamID, clientStreamID)
1174+
XCTAssertEqual((serverHandler.events[0] as? StreamClosedEvent)?.streamID, serverStreamID)
11751175

11761176
XCTAssertNoThrow(try self.clientChannel.finish())
11771177
XCTAssertNoThrow(try self.serverChannel.finish())

0 commit comments

Comments
 (0)