Updated tests

- Shutdown ELG in testUploadStreamingBackpressure
- Added isTestingNIOTS()
- Added testCorrectEventLoopGroup

Author: adam-fowler

Tests/AsyncHTTPClientTests/HTTPClientInternalTests.swift

@@ -239,6 +239,7 @@ class HTTPClientInternalTests: XCTestCase {
         defer {
             XCTAssertNoThrow(try httpClient.syncShutdown(requiresCleanClose: true))
             XCTAssertNoThrow(try httpBin.shutdown())
+            XCTAssertNoThrow(try eventLoopGroup.syncShutdownGracefully())
         }
 
         let request = try Request(url: "http://localhost:\(httpBin.port)/custom")

Tests/AsyncHTTPClientTests/HTTPClientTestUtils.swift

@@ -21,10 +21,15 @@ import NIOHTTPCompression
 import NIOSSL
 import NIOTransportServices
 
+/// Are we testing NIO Transport services
+func isTestingNIOTS() -> Bool {
+    return ProcessInfo.processInfo.environment["ENABLE_TS_TESTS"] == "true"
+}
+
 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"] == "true" {
+        isTestingNIOTS() {
         return NIOTSEventLoopGroup(loopCount: numberOfThreads, defaultQoS: .default)
     }
     #endif

Tests/AsyncHTTPClientTests/HTTPClientTests.swift

@@ -398,7 +398,7 @@ class HTTPClientTests: XCTestCase {
     func testProxyTLS() throws {
         XCTFail("Disabled test as it crashes");
         return
-        
+
         let httpBin = HTTPBin(simulateProxy: .tls)
         let httpClient = HTTPClient(
             eventLoopGroupProvider: .shared(self.clientGroup),
@@ -1101,11 +1101,9 @@ class HTTPClientTests: XCTestCase {
     }
 
     func testStressGetClose() throws {
-        if #available(OSX 10.14, iOS 12.0, tvOS 12.0, watchOS 6.0, *) {
-            guard !(self.clientGroup is NIOTSEventLoopGroup) else {
-                XCTFail("Disabled test as it crashes");
-                return
-            }
+        guard !isTestingNIOTS() else {
+            XCTFail("Disabled test as it crashes");
+            return
         }
         let httpBin = HTTPBin(ssl: false)
         let httpClient = HTTPClient(eventLoopGroupProvider: .shared(self.clientGroup),
@@ -1679,15 +1677,29 @@ class HTTPClientTests: XCTestCase {
     }
 
     func testAsyncShutdown() {
-        let eventLoopGroup = MultiThreadedEventLoopGroup(numberOfThreads: 1)
-        let httpClient = HTTPClient(eventLoopGroupProvider: .shared(eventLoopGroup))
-        let promise = eventLoopGroup.next().makePromise(of: Void.self)
-        eventLoopGroup.next().execute {
+        let httpClient = HTTPClient(eventLoopGroupProvider: .shared(self.clientGroup))
+        let promise = self.clientGroup.next().makePromise(of: Void.self)
+        self.clientGroup.next().execute {
             httpClient.shutdown(queue: DispatchQueue(label: "testAsyncShutdown")) { error in
                 XCTAssertNil(error)
                 promise.succeed(())
             }
         }
         XCTAssertNoThrow(try promise.futureResult.wait())
     }
+
+
+    func testCorrectEventLoopGroup() {
+        let httpClient = HTTPClient(eventLoopGroupProvider: .createNew)
+        defer {
+            XCTAssertNoThrow(try httpClient.syncShutdown())
+        }
+        #if canImport(Network)
+        if #available(OSX 10.14, iOS 12.0, tvOS 12.0, watchOS 6.0, *) {
+            XCTAssertTrue(httpClient.eventLoopGroup is NIOTSEventLoopGroup)
+            return
+        }
+        #endif
+        XCTAssertTrue(httpClient.eventLoopGroup is MultiThreadedEventLoopGroup)
+    }
 }