From 422a96624855169a133e02758338a385fd66fc22 Mon Sep 17 00:00:00 2001 From: Artem Redkin Date: Mon, 15 Jun 2020 13:50:59 +0100 Subject: [PATCH 1/3] fix test faling with NIOTS --- Tests/AsyncHTTPClientTests/HTTPClientInternalTests.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tests/AsyncHTTPClientTests/HTTPClientInternalTests.swift b/Tests/AsyncHTTPClientTests/HTTPClientInternalTests.swift index 5656fbe46..2c79849cb 100644 --- a/Tests/AsyncHTTPClientTests/HTTPClientInternalTests.swift +++ b/Tests/AsyncHTTPClientTests/HTTPClientInternalTests.swift @@ -797,7 +797,7 @@ class HTTPClientInternalTests: XCTestCase { } func testUncleanCloseThrows() { - let server = NIOHTTP1TestServer(group: self.clientGroup) + let server = NIOHTTP1TestServer(group: MultiThreadedEventLoopGroup(numberOfThreads: 1)) defer { XCTAssertNoThrow(try server.stop()) } From 313b3dd259de822463bbe42d337b50a856dc81a3 Mon Sep 17 00:00:00 2001 From: Artem Redkin Date: Mon, 15 Jun 2020 14:01:28 +0100 Subject: [PATCH 2/3] review fix --- Tests/AsyncHTTPClientTests/HTTPClientInternalTests.swift | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Tests/AsyncHTTPClientTests/HTTPClientInternalTests.swift b/Tests/AsyncHTTPClientTests/HTTPClientInternalTests.swift index 2c79849cb..c52c388f6 100644 --- a/Tests/AsyncHTTPClientTests/HTTPClientInternalTests.swift +++ b/Tests/AsyncHTTPClientTests/HTTPClientInternalTests.swift @@ -797,9 +797,11 @@ class HTTPClientInternalTests: XCTestCase { } func testUncleanCloseThrows() { - let server = NIOHTTP1TestServer(group: MultiThreadedEventLoopGroup(numberOfThreads: 1)) + let group = MultiThreadedEventLoopGroup(numberOfThreads: 1) + let server = NIOHTTP1TestServer(group: group) defer { XCTAssertNoThrow(try server.stop()) + XCTAssertNoThrow(try group.syncShutdownGracefully()) } let httpClient = HTTPClient(eventLoopGroupProvider: .shared(self.clientGroup)) From 1bd5751af9f78d9bcb6f36794528926ffb242efd Mon Sep 17 00:00:00 2001 From: Artem Redkin Date: Mon, 15 Jun 2020 15:02:18 +0100 Subject: [PATCH 3/3] review fixes --- .../AsyncHTTPClientTests/HTTPClientInternalTests.swift | 10 +++++++--- Tests/AsyncHTTPClientTests/HTTPClientTests.swift | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Tests/AsyncHTTPClientTests/HTTPClientInternalTests.swift b/Tests/AsyncHTTPClientTests/HTTPClientInternalTests.swift index c52c388f6..5c28fc16c 100644 --- a/Tests/AsyncHTTPClientTests/HTTPClientInternalTests.swift +++ b/Tests/AsyncHTTPClientTests/HTTPClientInternalTests.swift @@ -23,17 +23,23 @@ class HTTPClientInternalTests: XCTestCase { typealias Request = HTTPClient.Request typealias Task = HTTPClient.Task + var serverGroup: EventLoopGroup! var clientGroup: EventLoopGroup! override func setUp() { XCTAssertNil(self.clientGroup) + XCTAssertNil(self.serverGroup) + self.serverGroup = MultiThreadedEventLoopGroup(numberOfThreads: 1) self.clientGroup = getDefaultEventLoopGroup(numberOfThreads: 1) } override func tearDown() { + XCTAssertNotNil(self.serverGroup) + XCTAssertNoThrow(try self.serverGroup.syncShutdownGracefully()) XCTAssertNotNil(self.clientGroup) XCTAssertNoThrow(try self.clientGroup.syncShutdownGracefully()) self.clientGroup = nil + self.serverGroup = nil } func testHTTPPartsHandler() throws { @@ -797,11 +803,9 @@ class HTTPClientInternalTests: XCTestCase { } func testUncleanCloseThrows() { - let group = MultiThreadedEventLoopGroup(numberOfThreads: 1) - let server = NIOHTTP1TestServer(group: group) + let server = NIOHTTP1TestServer(group: self.serverGroup) defer { XCTAssertNoThrow(try server.stop()) - XCTAssertNoThrow(try group.syncShutdownGracefully()) } let httpClient = HTTPClient(eventLoopGroupProvider: .shared(self.clientGroup)) diff --git a/Tests/AsyncHTTPClientTests/HTTPClientTests.swift b/Tests/AsyncHTTPClientTests/HTTPClientTests.swift index 4cde4ab9f..61f9d63b0 100644 --- a/Tests/AsyncHTTPClientTests/HTTPClientTests.swift +++ b/Tests/AsyncHTTPClientTests/HTTPClientTests.swift @@ -2031,7 +2031,7 @@ class HTTPClientTests: XCTestCase { let second = elg.next() XCTAssertFalse(first === second) - let httpServer = NIOHTTP1TestServer(group: first) + let httpServer = NIOHTTP1TestServer(group: self.serverGroup) let httpClient = HTTPClient(eventLoopGroupProvider: .shared(first)) defer { XCTAssertNoThrow(try httpClient.syncShutdown())