Make sure ENABLE_TS_TESTS toggles TS on and off for all tests

Author: adam-fowler

Tests/AsyncHTTPClientTests/HTTPClientInternalTests.swift

@@ -23,6 +23,19 @@ class HTTPClientInternalTests: XCTestCase {
     typealias Request = HTTPClient.Request
     typealias Task = HTTPClient.Task
 
+    var clientGroup: EventLoopGroup!
+
+    override func setUp() {
+        XCTAssertNil(self.clientGroup)
+        self.clientGroup = getDefaultEventLoopGroup(numberOfThreads: 1)
+    }
+
+    override func tearDown() {
+        XCTAssertNotNil(self.clientGroup)
+        XCTAssertNoThrow(try self.clientGroup.syncShutdownGracefully())
+        self.clientGroup = nil
+    }
+
     func testHTTPPartsHandler() throws {
         let channel = EmbeddedChannel()
         let recorder = RecordingHandler<HTTPClientResponsePart, HTTPClientRequestPart>()
@@ -105,7 +118,7 @@ class HTTPClientInternalTests: XCTestCase {
 
     func testProxyStreaming() throws {
         let httpBin = HTTPBin()
-        let httpClient = HTTPClient(eventLoopGroupProvider: .createNew)
+        let httpClient = HTTPClient(eventLoopGroupProvider: .shared(self.clientGroup))
         defer {
             XCTAssertNoThrow(try httpClient.syncShutdown(requiresCleanClose: true))
             XCTAssertNoThrow(try httpBin.shutdown())
@@ -135,7 +148,7 @@ class HTTPClientInternalTests: XCTestCase {
 
     func testProxyStreamingFailure() throws {
         let httpBin = HTTPBin()
-        let httpClient = HTTPClient(eventLoopGroupProvider: .createNew)
+        let httpClient = HTTPClient(eventLoopGroupProvider: .shared(self.clientGroup))
         defer {
             XCTAssertNoThrow(try httpClient.syncShutdown(requiresCleanClose: true))
             XCTAssertNoThrow(try httpBin.shutdown())
@@ -442,7 +455,7 @@ class HTTPClientInternalTests: XCTestCase {
 
     func testResponseConnectionCloseGet() throws {
         let httpBin = HTTPBin(ssl: false)
-        let httpClient = HTTPClient(eventLoopGroupProvider: .createNew,
+        let httpClient = HTTPClient(eventLoopGroupProvider: .shared(self.clientGroup),
                                     configuration: HTTPClient.Configuration(certificateVerification: .none))
         defer {
             XCTAssertNoThrow(try httpClient.syncShutdown(requiresCleanClose: true))
@@ -546,11 +559,7 @@ class HTTPClientInternalTests: XCTestCase {
         }
 
         let url = "http://127.0.0.1:\(server.localAddress!.port!)"
-        let elg = getDefaultEventLoopGroup(numberOfThreads: 1)
-        defer {
-            XCTAssertNoThrow(try elg.syncShutdownGracefully())
-        }
-        let client = HTTPClient(eventLoopGroupProvider: .shared(elg))
+        let client = HTTPClient(eventLoopGroupProvider: .shared(self.clientGroup))
         defer {
             XCTAssertNoThrow(try client.syncShutdown())
         }
@@ -591,7 +600,7 @@ class HTTPClientInternalTests: XCTestCase {
     func testWeTolerateConnectionsGoingAwayWhilstPoolIsShuttingDown() {
         struct NoChannelError: Error {}
 
-        let client = HTTPClient(eventLoopGroupProvider: .createNew)
+        let client = HTTPClient(eventLoopGroupProvider: .shared(self.clientGroup))
         var maybeServersAndChannels: [(HTTPBin, Channel)]?
         XCTAssertNoThrow(maybeServersAndChannels = try (0..<10).map { _ in
             let web = HTTPBin()
@@ -673,7 +682,7 @@ class HTTPClientInternalTests: XCTestCase {
             XCTAssertNoThrow(try web.shutdown())
         }
 
-        let client = HTTPClient(eventLoopGroupProvider: .createNew)
+        let client = HTTPClient(eventLoopGroupProvider: .shared(self.clientGroup))
         defer {
             XCTAssertNoThrow(try client.syncShutdown())
         }

Tests/AsyncHTTPClientTests/HTTPClientTestUtils.swift

@@ -24,7 +24,7 @@ import NIOTransportServices
 func getDefaultEventLoopGroup(numberOfThreads: Int) -> EventLoopGroup {
     #if canImport(Network)
     if #available(OSX 10.14, iOS 12.0, tvOS 12.0, watchOS 6.0, *),
-    ProcessInfo.processInfo.environment["ENABLE_TS_TESTS"] != nil {
+    ProcessInfo.processInfo.environment["ENABLE_TS_TESTS"] == "true" {
         return NIOTSEventLoopGroup(loopCount: numberOfThreads, defaultQoS: .default)
     }
     #endif