Fix tests?!

Author: fabianfett

Sources/AsyncHTTPClient/ConnectionPool/State Machine/HTTPConnectionPool+HTTP1StateMachine.swift

@@ -250,6 +250,11 @@ extension HTTPConnectionPool {
             self.failedConsecutiveConnectionAttempts += 1
             self.lastConnectFailure = error
 
+            // We don't care how many waiting requests we have at this point, we will schedule a
+            // retry. More tasks, may appear until the backoff has completed. The final
+            // decision about the retry will be made in `connectionCreationBackoffDone(_:)`
+            let eventLoop = self.connections.backoffNextConnectionAttempt(connectionID)
+
             switch self.lifecycleState {
             case .running:
                 guard self.retryConnectionEstablishment else {
@@ -265,10 +270,6 @@ extension HTTPConnectionPool {
                         connection: .none
                     )
                 }
-                // We don't care how many waiting requests we have at this point, we will schedule a
-                // retry. More tasks, may appear until the backoff has completed. The final
-                // decision about the retry will be made in `connectionCreationBackoffDone(_:)`
-                let eventLoop = self.connections.backoffNextConnectionAttempt(connectionID)
 
                 let backoff = calculateBackoff(failedAttempt: self.failedConsecutiveConnectionAttempts)
                 return .init(

Sources/AsyncHTTPClient/ConnectionPool/State Machine/HTTPConnectionPool+HTTP2StateMachine.swift

@@ -226,20 +226,18 @@ extension HTTPConnectionPool {
         ) -> EstablishedAction {
             self.failedConsecutiveConnectionAttempts = 0
             self.lastConnectFailure = nil
-            if self.connections.hasActiveConnection(for: connection.eventLoop) {
-                guard let (index, _) = self.connections.failConnection(connection.id) else {
-                    preconditionFailure("we have established a new connection that we know nothing about?")
-                }
-                self.connections.removeConnection(at: index)
+            let doesConnectionExistsForEL = self.connections.hasActiveConnection(for: connection.eventLoop)
+            let (index, context) = self.connections.newHTTP2ConnectionEstablished(
+                connection,
+                maxConcurrentStreams: maxConcurrentStreams
+            )
+            if doesConnectionExistsForEL {
+                let connection = self.connections.closeConnection(at: index)
                 return .init(
                     request: .none,
                     connection: .closeConnection(connection, isShutdown: .no)
                 )
             } else {
-                let (index, context) = self.connections.newHTTP2ConnectionEstablished(
-                    connection,
-                    maxConcurrentStreams: maxConcurrentStreams
-                )
                 return self.nextActionForAvailableConnection(at: index, context: context)
             }
         }
@@ -424,6 +422,8 @@ extension HTTPConnectionPool {
             self.failedConsecutiveConnectionAttempts += 1
             self.lastConnectFailure = error
 
+            let eventLoop = self.connections.backoffNextConnectionAttempt(connectionID)
+
             switch self.lifecycleState {
             case .running:
                 guard self.retryConnectionEstablishment else {
@@ -440,7 +440,6 @@ extension HTTPConnectionPool {
                     )
                 }
 
-                let eventLoop = self.connections.backoffNextConnectionAttempt(connectionID)
                 let backoff = calculateBackoff(failedAttempt: self.failedConsecutiveConnectionAttempts)
                 return .init(
                     request: .none,

Tests/AsyncHTTPClientTests/HTTPConnectionPool+HTTP1ConnectionsTest.swift

@@ -384,6 +384,8 @@ class HTTPConnectionPool_HTTP1ConnectionsTests: XCTestCase {
         XCTAssertEqual(connections.closeConnection(at: releaseIndex), lease)
         XCTAssertFalse(connections.isEmpty)
 
+        let backoffEL = connections.backoffNextConnectionAttempt(startingID)
+        XCTAssertIdentical(backoffEL, el2)
         guard let (failIndex, _) = connections.failConnection(startingID) else {
             return XCTFail("Expected that the connection is remembered")
         }

Tests/AsyncHTTPClientTests/HTTPConnectionPool+HTTP2ConnectionsTest.swift

@@ -331,6 +331,8 @@ class HTTPConnectionPool_HTTP2ConnectionsTests: XCTestCase {
         XCTAssertEqual(connections.closeConnection(at: releaseIndex), leasedConn)
         XCTAssertFalse(connections.isEmpty)
 
+        let backoffEL = connections.backoffNextConnectionAttempt(startingID)
+        XCTAssertIdentical(el6, backoffEL)
         guard let (failIndex, _) = connections.failConnection(startingID) else {
             return XCTFail("Expected that the connection is remembered")
         }