Skip to content

fix: gate federated conversation create on assertFullyConnected #5430

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
blackheaven wants to merge 3 commits into
base: develop
Choose a base branch
from
+19 −0
Open

fix: gate federated conversation create on assertFullyConnected #5430

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
485ae56
fix: gate federated conversation create on assertFullyConnected
blackheaven Aug 10, 2026
6b2c72c
Hello CI
blackheaven Aug 10, 2026
3dd6dad
Update integration/test/API/GalleyInternal.hs
blackheaven Aug 11, 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
15 changes: 15 additions & 0 deletions integration/test/API/GalleyInternal.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,21 @@ getFederationStatus user domains =
$ req
& addJSONObject ["domains" .= domainList]

-- | Poll until the user's backend is fully connected to all given domains
assertFullyConnected ::
( HasCallStack,
MakesValue user
) =>
user ->
[String] ->
App ()
assertFullyConnected user domains =
eventually
$ bindResponse (getFederationStatus user domains)
$ \resp -> do
resp.status `shouldMatchInt` 200
resp.json %. "status" `shouldMatch` "fully-connected"

-- | https://staging-nginz-https.zinfra.io/api-internal/swagger-ui/galley/#/galley/put_i_legalhold_whitelisted_teams__tid_
legalholdWhitelistTeam :: (HasCallStack, MakesValue uid, MakesValue tid) => tid -> uid -> App Response
legalholdWhitelistTeam tid uid = do
Expand Down
4 changes: 4 additions & 0 deletions integration/test/Test/Conversation.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -526,6 +526,10 @@ testAddUnreachableUserFromFederatingBackend domain = do
otherDomain <- make domain & asString
[alice, bob, charlie, chad] <-
createAndConnectUsers [ownDomain, otherDomain, cDom.berDomain, cDom.berDomain]
-- Wait for ownDomain <-> {fed2, dynamicC} to be fully connected before
-- creating the conversation, so a transient fed2 reachability blip under
-- dynamic-backend churn does not turn the create into a 533 (WPB-3797).
assertFullyConnected alice [otherDomain, cDom.berDomain]

conv <- withWebSockets [bob, charlie] $ \wss -> do
conv <-
Expand Down