From 03b2ba591617afcc9767bc538e2fbe372ac38ae6 Mon Sep 17 00:00:00 2001 From: David Nadoba Date: Thu, 21 Apr 2022 15:32:38 +0200 Subject: [PATCH 1/2] fix flaky test --- Tests/AsyncHTTPClientTests/HTTPClientTests.swift | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Tests/AsyncHTTPClientTests/HTTPClientTests.swift b/Tests/AsyncHTTPClientTests/HTTPClientTests.swift index 6bb4dd9b4..866088d2a 100644 --- a/Tests/AsyncHTTPClientTests/HTTPClientTests.swift +++ b/Tests/AsyncHTTPClientTests/HTTPClientTests.swift @@ -1216,9 +1216,9 @@ class HTTPClientTests: XCTestCase { method: .GET, headers: ["X-internal-delay": "2000"], body: nil) - let start = Date() - let response = try! self.defaultClient.execute(request: req).wait() - XCTAssertGreaterThan(Date().timeIntervalSince(start), 2) + let start = NIODeadline.now() + let response = try self.defaultClient.execute(request: req).wait() + XCTAssertGreaterThanOrEqual(.now() - start, .milliseconds(1_900 /* 1.9 seconds */)) XCTAssertEqual(response.status, .ok) } From 85742543a0337d672520fe4f63c700efb9fdb553 Mon Sep 17 00:00:00 2001 From: David Nadoba Date: Thu, 21 Apr 2022 19:06:41 +0200 Subject: [PATCH 2/2] SwiftFormat (disable `numberFormatting`) if `numberFormatting` is disable, it will allows us to add `_` in number literals when appropriate --- .swiftformat | 1 + Tests/AsyncHTTPClientTests/HTTPClientTests.swift | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.swiftformat b/.swiftformat index c26e226e3..7b7c486ea 100644 --- a/.swiftformat +++ b/.swiftformat @@ -19,5 +19,6 @@ --disable redundantReturn --disable preferKeyPath --disable sortedSwitchCases +--disable numberFormatting # rules diff --git a/Tests/AsyncHTTPClientTests/HTTPClientTests.swift b/Tests/AsyncHTTPClientTests/HTTPClientTests.swift index 866088d2a..a6eff950a 100644 --- a/Tests/AsyncHTTPClientTests/HTTPClientTests.swift +++ b/Tests/AsyncHTTPClientTests/HTTPClientTests.swift @@ -1218,7 +1218,7 @@ class HTTPClientTests: XCTestCase { body: nil) let start = NIODeadline.now() let response = try self.defaultClient.execute(request: req).wait() - XCTAssertGreaterThanOrEqual(.now() - start, .milliseconds(1_900 /* 1.9 seconds */)) + XCTAssertGreaterThanOrEqual(.now() - start, .milliseconds(1_900 /* 1.9 seconds */ )) XCTAssertEqual(response.status, .ok) }