Skip to content

@W-23054065: [iOS] Stabilize flaky REST API and auth tests #4068

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

Open
JohnsonEricAtSalesforce wants to merge 11 commits into
base: dev
Choose a base branch
from
+273 −83
Open

@W-23054065: [iOS] Stabilize flaky REST API and auth tests #4068

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
fcd6779
[iOS] Stabilize flaky REST API and auth tests
JohnsonEricAtSalesforce Jun 13, 2026
4c75337
[iOS] Use UUID for record names + remove 404-acceptance logic that ma…
JohnsonEricAtSalesforce Jun 17, 2026
ddb20a6
[iOS] Fix retry helpers asserting on each attempt — should only fail …
JohnsonEricAtSalesforce Jun 17, 2026
f9497e1
Restore original whitespace on blank lines
JohnsonEricAtSalesforce Jun 17, 2026
5cc4c30
Restore remaining whitespace on lines 622-623
JohnsonEricAtSalesforce Jun 17, 2026
c2712f4
Add nil-check assertions to UntilEmpty polling helpers
JohnsonEricAtSalesforce Jun 18, 2026
08cfcfa
Handle nil records in UntilEmpty verification without hard-failing
JohnsonEricAtSalesforce Jun 18, 2026
d831462
Address reviewer feedback: consistency improvements
JohnsonEricAtSalesforce Jun 18, 2026
df311bc
Replace early-return guards with setContinueAfterFailure:NO
JohnsonEricAtSalesforce Jun 19, 2026
a8ba8e2
Extract shared polling helper for SOSL/SOQL retry methods
JohnsonEricAtSalesforce Jun 19, 2026
1cc9c54
Work around SDK timezone bug in testUpdateWithIfUnmodifiedSince
JohnsonEricAtSalesforce Jun 19, 2026
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
18 changes: 17 additions & 1 deletion libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Test/TestSetupUtils.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,23 @@ + (SFSDKTestCredentialsData *)populateAuthCredentialsFromString:(NSString *)test
}

+ (void)synchronousAuthRefresh {
[self synchronousAuthRefreshWithUserDidLoginNotification:NO];
[self synchronousAuthRefreshWithRetries:3];
}

+ (void)synchronousAuthRefreshWithRetries:(NSInteger)maxRetries {

@JohnsonEricAtSalesforce JohnsonEricAtSalesforce Jun 17, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Improvement — Auth resilience for class setUp.

CI runs showed that when the test org is briefly unreachable during +setUp, ALL tests in SalesforceRestAPITests cascade-fail (50+ tests report "Setting up authentication failed"). This was the single most common failure pattern in overnight CI.

This adds a 3-attempt retry with 3s backoff. After exhausting attempts, it still throws — the test suite still fails if auth is genuinely broken. The NSLog on each retry provides CI visibility into recovery frequency.

Same end-state assertion: auth must succeed or the suite aborts.

This response was generated by an AI agent on behalf of @JohnsonEricAtSalesforce.

for (NSInteger attempt = 1; attempt <= maxRetries; attempt++) {
@try {
[self synchronousAuthRefreshWithUserDidLoginNotification:NO];
return;
} @catch (NSException *exception) {
if (attempt < maxRetries) {
NSLog(@"[TestSetupUtils] Auth refresh attempt %ld failed: %@. Retrying in 3s...", (long)attempt, exception.reason);
[NSThread sleepForTimeInterval:3.0];
} else {
@throw;
}
}
}
}

+ (void)synchronousAuthRefreshWithUserDidLoginNotification:(BOOL)postUserDidLogIn
Expand Down
2 changes: 1 addition & 1 deletion libs/SalesforceSDKCore/SalesforceSDKCoreTests/SFSDKAuthUtilTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ class SFSDKAuthUtilTests: XCTestCase {
endpointResponse = response
expectation.fulfill()
}
self.wait(for: [expectation], timeout: 30)
self.wait(for: [expectation], timeout: 60)

@JohnsonEricAtSalesforce JohnsonEricAtSalesforce Jun 17, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Timeout increase — same assertion, accommodates CI org load.

testAccessToken hits the live org's token endpoint. In CI runs with parallel test execution across iOS 18 + iOS 26 (4 simultaneous jobs hitting the same org), the endpoint regularly exceeded 30s. The test still asserts the same outcome (valid token, no error) — it just allows more time for the server to respond.

This response was generated by an AI agent on behalf of @JohnsonEricAtSalesforce.

let response = try XCTUnwrap(endpointResponse)
XCTAssertFalse(response.hasError)
XCTAssertNotNil(response.accessToken)
Expand Down
Loading
Loading