Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Fix Flaky Test - Remove force unwrapping in URL response validation #2091

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Fix Flaky Test - Remove force unwrapping in URL response validation #2091

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
31 changes: 12 additions & 19 deletions Datadog/IntegrationUnitTests/Public/NetworkInstrumentationIntegrationTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,9 +107,7 @@ class NetworkInstrumentationIntegrationTests: XCTestCase {
applicationID: .mockAny(),
urlSessionTracking: .init(
resourceAttributesProvider: { req, resp, data, err in
XCTAssertNotNil(data)
XCTAssertTrue(data!.count > 0)
providerDataCount = data!.count
providerDataCount = data?.count ?? 0
providerExpectation.fulfill()
return [:]
})
Expand Down Expand Up @@ -149,17 +147,14 @@ class NetworkInstrumentationIntegrationTests: XCTestCase {
)

let providerExpectation = expectation(description: "provider called")
var providerDataCount = 0
var providerData: Data?
var providerInfo: (resp: URLResponse?, data: Data?, err: Error?)?

RUM.enable(
with: .init(
applicationID: .mockAny(),
urlSessionTracking: .init(
resourceAttributesProvider: { req, resp, data, err in
XCTAssertNotNil(data)
XCTAssertTrue(data!.count > 0)
providerDataCount = data!.count
data.map { providerData = $0 }
resourceAttributesProvider: { _, resp, data, err in
providerInfo = (resp, data, err)
providerExpectation.fulfill()
return [:]
})
Expand All @@ -182,20 +177,18 @@ class NetworkInstrumentationIntegrationTests: XCTestCase {
let request = URLRequest(url: URL(string: "https://www.datadoghq.com/")!)

let taskExpectation = self.expectation(description: "task completed")
var taskDataCount = 0
var taskData: Data?
let task = session.dataTask(with: request) { data, _, _ in
XCTAssertNotNil(data)
XCTAssertTrue(data!.count > 0)
taskDataCount = data!.count
data.map { taskData = $0 }
var taskInfo: (resp: URLResponse?, data: Data?, err: Error?)?

let task = session.dataTask(with: request) { resp, data, err in
taskInfo = (data, resp, err)
taskExpectation.fulfill()
}
task.resume()

wait(for: [providerExpectation, taskExpectation], timeout: 10)
XCTAssertEqual(providerDataCount, taskDataCount)
XCTAssertEqual(providerData, taskData)
XCTAssertEqual(providerInfo?.resp, taskInfo?.resp)
XCTAssertEqual(providerInfo?.data, taskInfo?.data)
XCTAssertEqual(providerInfo?.err as? NSError, taskInfo?.err as? NSError)
}

class InstrumentedSessionDelegate: NSObject, URLSessionDataDelegate {
Expand Down