Skip to content

[Collections] Fix flakey tests #3409

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 16, 2021
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -233,10 +233,10 @@ class JSONPackageCollectionProviderTests: XCTestCase {
})
}

func testUnsuccessfulHead() throws {
func testUnsuccessfulHead_unavailable() throws {
let url = URL(string: "https://www.test.com/collection.json")!
let source = PackageCollectionsModel.CollectionSource(type: .json, url: url)
let statusCode = Int.random(in: 201 ... 550)
let statusCode = Int.random(in: 500 ... 550) // Don't use 404 because it leads to a different error message

let handler: HTTPClient.Handler = { request, _, completion in
XCTAssertEqual(request.url, url, "url should match")
Expand All @@ -253,10 +253,10 @@ class JSONPackageCollectionProviderTests: XCTestCase {
})
}

func testUnsuccessfulGet() throws {
func testUnsuccessfulGet_unavailable() throws {
let url = URL(string: "https://www.test.com/collection.json")!
let source = PackageCollectionsModel.CollectionSource(type: .json, url: url)
let statusCode = Int.random(in: 201 ... 550)
let statusCode = Int.random(in: 500 ... 550) // Don't use 404 because it leads to a different error message

let handler: HTTPClient.Handler = { request, _, completion in
XCTAssertEqual(request.url, url, "url should match")
Expand All @@ -279,6 +279,50 @@ class JSONPackageCollectionProviderTests: XCTestCase {
})
}

func testUnsuccessfulHead_notFound() throws {
let url = URL(string: "https://www.test.com/collection.json")!
let source = PackageCollectionsModel.CollectionSource(type: .json, url: url)

let handler: HTTPClient.Handler = { request, _, completion in
XCTAssertEqual(request.url, url, "url should match")
XCTAssertEqual(request.method, .head, "method should match")
completion(.success(.init(statusCode: 404)))
}

var httpClient = HTTPClient(handler: handler)
httpClient.configuration.circuitBreakerStrategy = .none
httpClient.configuration.retryStrategy = .none
let provider = JSONPackageCollectionProvider(httpClient: httpClient, diagnosticsEngine: DiagnosticsEngine())
XCTAssertThrowsError(try tsc_await { callback in provider.get(source, callback: callback) }, "expected error", { error in
XCTAssertEqual(error as? JSONPackageCollectionProvider.Errors, .collectionNotFound(url))
})
}

func testUnsuccessfulGet_notFound() throws {
let url = URL(string: "https://www.test.com/collection.json")!
let source = PackageCollectionsModel.CollectionSource(type: .json, url: url)

let handler: HTTPClient.Handler = { request, _, completion in
XCTAssertEqual(request.url, url, "url should match")
switch request.method {
case .head:
completion(.success(.init(statusCode: 200, headers: .init([.init(name: "Content-Length", value: "1")]))))
case .get:
completion(.success(.init(statusCode: 404)))
default:
XCTFail("method should match")
}
}

var httpClient = HTTPClient(handler: handler)
httpClient.configuration.circuitBreakerStrategy = .none
httpClient.configuration.retryStrategy = .none
let provider = JSONPackageCollectionProvider(httpClient: httpClient, diagnosticsEngine: DiagnosticsEngine())
XCTAssertThrowsError(try tsc_await { callback in provider.get(source, callback: callback) }, "expected error", { error in
XCTAssertEqual(error as? JSONPackageCollectionProvider.Errors, .collectionNotFound(url))
})
}

func testBadJSON() throws {
let url = URL(string: "https://www.test.com/collection.json")!
let data = "blah".data(using: .utf8)!
Expand Down