Skip to content

spar-integration: retry transient 5xx on client delete in re-auth test #5314

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

Draft
blackheaven wants to merge 2 commits into
base: develop
Choose a base branch
from
Draft

spar-integration: retry transient 5xx on client delete in re-auth test #5314

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b4ed5b3
spar-integration: retry transient 5xx on client delete in re-auth test
blackheaven Jul 3, 2026
bd30c6d
Hello CI
blackheaven Jul 3, 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
27 changes: 15 additions & 12 deletions services/spar/test-integration/Test/Spar/APISpec.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1669,22 +1669,25 @@ specReAuthSsoUserWithPassword =
newClientVerificationCode = Nothing
}

deleteClient :: (MonadIO m, MonadReader TestEnv m) => BrigReq -> UserId -> ClientId -> Maybe Text -> Int -> m ()
deleteClient brig u c pw expectedStatus =
void $
call $
delete $
brig
. paths ["clients", toByteString' c]
. zUser u
. zConn "conn"
. contentJson
. body payload
. expectStatus ((==) expectedStatus)
deleteClient :: (HasCallStack, MonadIO m, MonadReader TestEnv m) => BrigReq -> UserId -> ClientId -> Maybe Text -> Int -> m ()
deleteClient brig u c pw expectedStatus = do
resp <-
retryNUntil transientRetries (\r -> statusCode r `notElem` transientStatuses) $
call $
delete $
brig
. paths ["clients", toByteString' c]
. zUser u
. zConn "conn"
. contentJson
. body payload
liftIO $ statusCode resp `shouldBe` expectedStatus
where
payload =
RequestBodyLBS . encode . object . maybeToList $
fmap ("password" .=) pw
transientStatuses = [500, 502, 503, 504]

@akshaymankar akshaymankar Jul 7, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I think we shouldn't retry here, but find out why brig is failing with 5xx and fix that.

transientRetries = 10

----------------------------------------------------------------------
-- tests for bsi audit
Expand Down