Skip to content

Commit 2e15b58

Browse files
committed
Revert "run swift-format and generate_linux_tests.rb"
This reverts commit b00e475.
1 parent b00e475 commit 2e15b58

File tree

1 file changed

+16
-15
lines changed

1 file changed

+16
-15
lines changed

Diff for: Tests/AsyncHTTPClientTests/HTTPConnectionPool+HTTP2StateMachineTests.swift

+16-15
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ class HTTPConnectionPool_HTTP2StateMachineTests: XCTestCase {
9696
XCTAssertEqual(action.request, .none)
9797
XCTAssertEqual(action.connection, .none)
9898
}
99-
99+
100100
/// 4 streams are available and therefore request should be executed immediately
101101
for _ in 0..<4 {
102102
let mockRequest = MockHTTPRequest(eventLoop: el1, requiresEventLoopForChannel: true)
@@ -106,7 +106,7 @@ class HTTPConnectionPool_HTTP2StateMachineTests: XCTestCase {
106106
XCTAssertEqual(action.connection, .none)
107107
XCTAssertEqual(action.request, .executeRequest(request, conn, cancelTimeout: false))
108108
}
109-
109+
110110
/// closing streams without any queued requests shouldn't do anything if it's *not* the last stream
111111
for _ in 0..<4 {
112112
let action = state.http2ConnectionStreamClosed(connID)
@@ -341,11 +341,11 @@ class HTTPConnectionPool_HTTP2StateMachineTests: XCTestCase {
341341
XCTAssertEqual(releaseAction.request, .none)
342342
XCTAssertEqual(releaseAction.connection, .closeConnection(conn1, isShutdown: .yes(unclean: true)))
343343
}
344-
344+
345345
func testSchedulingAndCancelingOfIdleTimeout() {
346346
let elg = EmbeddedEventLoopGroup(loops: 1)
347347
let el1 = elg.next()
348-
348+
349349
// establish one idle http2 connection
350350
let idGenerator = HTTPConnectionPool.Connection.ID.Generator()
351351
var http1Conns = HTTPConnectionPool.HTTP1Connections(maximumConcurrentConnections: 8, generator: idGenerator)
@@ -360,36 +360,36 @@ class HTTPConnectionPool_HTTP2StateMachineTests: XCTestCase {
360360
let connectAction = state.newHTTP2ConnectionEstablished(conn1, maxConcurrentStreams: 100)
361361
XCTAssertEqual(connectAction.request, .none)
362362
XCTAssertEqual(connectAction.connection, .scheduleTimeoutTimer(conn1ID, on: el1))
363-
363+
364364
// execute request on idle connection
365365
let mockRequest1 = MockHTTPRequest(eventLoop: el1)
366366
let request1 = HTTPConnectionPool.Request(mockRequest1)
367367
let request1Action = state.executeRequest(request1)
368368
XCTAssertEqual(request1Action.request, .executeRequest(request1, conn1, cancelTimeout: false))
369369
XCTAssertEqual(request1Action.connection, .cancelTimeoutTimer(conn1ID))
370-
370+
371371
// close stream
372372
let closeStream1Action = state.http2ConnectionStreamClosed(conn1ID)
373373
XCTAssertEqual(closeStream1Action.request, .none)
374374
XCTAssertEqual(closeStream1Action.connection, .scheduleTimeoutTimer(conn1ID, on: el1))
375-
375+
376376
// execute request on idle connection with required event loop
377377
let mockRequest2 = MockHTTPRequest(eventLoop: el1, requiresEventLoopForChannel: true)
378378
let request2 = HTTPConnectionPool.Request(mockRequest2)
379379
let request2Action = state.executeRequest(request2)
380380
XCTAssertEqual(request2Action.request, .executeRequest(request2, conn1, cancelTimeout: false))
381381
XCTAssertEqual(request2Action.connection, .cancelTimeoutTimer(conn1ID))
382-
382+
383383
// close stream
384384
let closeStream2Action = state.http2ConnectionStreamClosed(conn1ID)
385385
XCTAssertEqual(closeStream2Action.request, .none)
386386
XCTAssertEqual(closeStream2Action.connection, .scheduleTimeoutTimer(conn1ID, on: el1))
387387
}
388-
388+
389389
func testConnectionTimeout() {
390390
let elg = EmbeddedEventLoopGroup(loops: 1)
391391
let el1 = elg.next()
392-
392+
393393
// establish one idle http2 connection
394394
let idGenerator = HTTPConnectionPool.Connection.ID.Generator()
395395
var http1Conns = HTTPConnectionPool.HTTP1Connections(maximumConcurrentConnections: 8, generator: idGenerator)
@@ -404,19 +404,20 @@ class HTTPConnectionPool_HTTP2StateMachineTests: XCTestCase {
404404
let connectAction = state.newHTTP2ConnectionEstablished(conn1, maxConcurrentStreams: 100)
405405
XCTAssertEqual(connectAction.request, .none)
406406
XCTAssertEqual(connectAction.connection, .scheduleTimeoutTimer(conn1ID, on: el1))
407-
407+
408+
408409
// let the connection timeout
409410
let timeoutAction = state.connectionIdleTimeout(conn1ID)
410411
XCTAssertEqual(timeoutAction.request, .none)
411412
XCTAssertEqual(timeoutAction.connection, .closeConnection(conn1, isShutdown: .no))
412413
}
413-
414+
414415
func testConnectionEstablishmentFailure() {
415416
struct SomeError: Error, Equatable {}
416-
417+
417418
let elg = EmbeddedEventLoopGroup(loops: 1)
418419
let el1 = elg.next()
419-
420+
420421
// establish one idle http2 connection
421422
let idGenerator = HTTPConnectionPool.Connection.ID.Generator()
422423
var http1Conns = HTTPConnectionPool.HTTP1Connections(maximumConcurrentConnections: 8, generator: idGenerator)
@@ -427,7 +428,7 @@ class HTTPConnectionPool_HTTP2StateMachineTests: XCTestCase {
427428
requests: HTTPConnectionPool.RequestQueue()
428429
)
429430
XCTAssertEqual(migrationAction, .none)
430-
431+
431432
let action = state.failedToCreateNewConnection(SomeError(), connectionID: conn1ID)
432433
XCTAssertEqual(action.request, .none)
433434
guard case .scheduleBackoffTimer(conn1ID, _, let eventLoop) = action.connection else {

0 commit comments

Comments
 (0)