fix retries in tests (#4801)

[jjngx]

Proposed changes

Cherry pick from the main branch - fix for tests

Checklist

Before creating a PR, run through this checklist and mark each as complete.

• I have read the CONTRIBUTING doc
• I have added tests that prove my fix is effective or that my feature works
• I have checked that all unit tests pass after adding my changes
• I have updated necessary documentation
• I have rebased my branch onto main
• I will ensure my PR is targeting the main branch and pulling from my branch from my own fork

[codecov]

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (604d1db) 52.01% compared to head (e0e88fd) 52.01%.

Additional details and impacted files

@@             Coverage Diff              @@
##           release-3.4    #4806   +/-   ##
============================================
  Coverage        52.01%   52.01%           
============================================
  Files               60       60           
  Lines            17313    17313           
============================================
  Hits              9005     9005           
  Misses            7995     7995           
  Partials           313      313           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.