CPLAT-11790: repair master test build after concurrent search PRs - #163
Merged
Merged
Conversation
#160 added a SearchMode argument to updateSearchResults while #162 added tests that call it. Both were green on their own branches and neither touched the other's files, so git merged them without conflict — but the merged tree does not compile: vet: search_resume_test.go:17: not enough arguments in call to a.updateSearchResults have ([]session.SearchResult) want ([]session.SearchResult, session.SearchMode) Production code is unaffected (go build passes); only the test callers are stale. Pass SearchModeScan, which is what these tests were written against — they exercise live badges and resume, not index coverage.
|
| Commit | Scanned at | New | Resolved | Net |
|---|---|---|---|---|
30bc32f < |
2026-08-30 12:48 UTC | 0 | 0 | 0 |
Last scanned: 30bc32f · 2026-08-30 12:48 UTC
|
| Commit | Scanned at | New | Resolved | Net |
|---|---|---|---|---|
30bc32f |
2026-08-30 12:48 UTC | — | — | — |
30bc32f < |
2026-08-30 12:48 UTC | 0 | 0 | 0 |
Last scanned: 30bc32f · 2026-08-30 12:48 UTC
Kairo-Kim
approved these changes
Aug 30, 2026
Kairo-Kim
added
the
auto-review/approved
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
4 participants
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.
JIRA: https://sendbird.atlassian.net/browse/CPLAT-11790
Problem
master CI is currently failing (run on
a8c00d6).#160 added a
SearchModeargument toupdateSearchResults; #162 added tests that call it. Both were green on their own branches, and neither touched the other's files — so git merged them without conflict, and the merged tree does not compile:This is the semantic-conflict class that a textual merge cannot catch: each PR was correct against the base it was tested on.
Scope
Production code is unaffected —
go build ./...passes on master today. Only the test callers are stale, so the breakage is CI-only, not user-facing.Fix
Pass
SearchModeScanat the three call sites. That is the mode these tests were written against — they exercise live badges and resume behavior, not index coverage, so the mode is incidental to what they assert.Verification
go vet ./...clean, full suite green.