test: poll for shutDownCalled in startWithHttp401ShutsDownSink test (SDK-2028)#329
Merged
aaron-zeisler merged 1 commit intomainfrom Mar 17, 2026
Merged
Conversation
…Sink test The test was flaky because it asserted shutDownCalled immediately after callback.awaitError() returned. Since the production code calls resultCallback.onError() before dataSourceUpdateSink.shutDown(), the background thread may not have reached shutDown() yet when the test thread resumes. Added a short polling loop (up to 1 second) to wait for shutDownCalled to become true before asserting, eliminating the race condition. Resolves SDK-2028 Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Contributor
Author
🤖 Devin AI EngineerI'll be helping with this pull request! Here's what you should know: ✅ I will automatically:
Note: I can only respond to comments from users who have write access to this repository. ⚙️ Control Options:
|
Contributor
Author
|
Adding label: devin-pr |
8 tasks
tanderson-ld
approved these changes
Mar 17, 2026
aaron-zeisler
approved these changes
Mar 17, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Requirements
Related issues
StreamingDataSourceTest.startWithHttp401ShutsDownSinkrace conditionDescribe the solution you've provided
The
startWithHttp401ShutsDownSinktest is flaky due to a race condition. InStreamingDataSource.onError(), the production code callsresultCallback.onError()(which unblocks the test'scallback.awaitError()) before callingdataSourceUpdateSink.shutDown(). The test thread can resume and assertshutDownCalledbefore the background thread reaches theshutDown()call.This PR adds a short polling loop (up to 1 second, checking every 10ms) to wait for
shutDownCalledto becometruebefore asserting. This is a test-only change — no production code is modified.Key review points:
shutDownCalledis declaredvolatileinMockDataSourceUpdateSink(line 141 ofMockComponents.java), so cross-thread visibility is guaranteedassertFalse(shutDownCalled)are not affected by this race sinceshutDown()is never called in those code pathsDescribe alternatives you've considered
Approach 2 (not used): Reorder production code in
StreamingDataSource.onError()to callshutDown()beforeresultCallback.onError(). This would fix the root cause but changes production behavior and carries more risk. Per team discussion, Approach 1 (test-only fix) was chosen as the safer option.Additional context
The Android SDK is required to compile/run tests locally, so this change relies on CI for validation.
Link to Devin session: https://app.devin.ai/sessions/c61d7f41a5ec43208840f81363097b09
Note
Low Risk
Low risk test-only change that adds a short wait to avoid a race between the background thread reporting the error and shutting down the update sink.
Overview
Fixes a flaky
StreamingDataSourceTest.startWithHttp401ShutsDownSinkby waiting (up to 1s, polling) fordataSourceUpdateSink.shutDownCalledto become true before asserting.No production behavior changes; this only adjusts the test’s timing expectations for the async shutdown path after an HTTP 401.
Written by Cursor Bugbot for commit 4ebcfc9. This will update automatically on new commits. Configure here.