From 4aa5a211952d7797083a06df3ae77b432a0a8fe2 Mon Sep 17 00:00:00 2001 From: David Evans Date: Tue, 27 Apr 2021 14:42:45 +0100 Subject: [PATCH] Fix tests --- Package.swift | 2 +- Tests/AsyncHTTPClientTests/HTTPClientTests.swift | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Package.swift b/Package.swift index 01912ec09..a14c1db8b 100644 --- a/Package.swift +++ b/Package.swift @@ -22,7 +22,7 @@ let package = Package( ], dependencies: [ .package(url: "https://github.com/apple/swift-nio.git", from: "2.27.0"), - .package(url: "https://github.com/apple/swift-nio-ssl.git", from: "2.8.0"), + .package(url: "https://github.com/apple/swift-nio-ssl.git", from: "2.12.0"), .package(url: "https://github.com/apple/swift-nio-extras.git", from: "1.3.0"), .package(url: "https://github.com/apple/swift-nio-transport-services.git", from: "1.5.1"), .package(url: "https://github.com/apple/swift-log.git", from: "1.4.0"), diff --git a/Tests/AsyncHTTPClientTests/HTTPClientTests.swift b/Tests/AsyncHTTPClientTests/HTTPClientTests.swift index 7e0948aef..34e95924e 100644 --- a/Tests/AsyncHTTPClientTests/HTTPClientTests.swift +++ b/Tests/AsyncHTTPClientTests/HTTPClientTests.swift @@ -2711,7 +2711,10 @@ class HTTPClientTests: XCTestCase { if isTestingNIOTS() { XCTAssertEqual(error as? ChannelError, .connectTimeout(.milliseconds(100))) } else { - XCTAssertEqual(error as? NIOSSLError, NIOSSLError.uncleanShutdown) + switch error as? NIOSSLError { + case .some(.handshakeFailed(.sslError(_))): break + default: XCTFail("Handshake failed with unexpected error: \(String(describing: error))") + } } } } @@ -2755,7 +2758,10 @@ class HTTPClientTests: XCTestCase { if isTestingNIOTS() { XCTAssertEqual(error as? ChannelError, .connectTimeout(.milliseconds(200))) } else { - XCTAssertEqual(error as? NIOSSLError, NIOSSLError.uncleanShutdown) + switch error as? NIOSSLError { + case .some(.handshakeFailed(.sslError(_))): break + default: XCTFail("Handshake failed with unexpected error: \(String(describing: error))") + } } } }