Use retry_until in more places

[tony]

No description provided.

[codecov]

Codecov Report

Merging #781 (1570f49) into master (1570f49) will not change coverage.
The diff coverage is n/a.

❗ Current head 1570f49 differs from pull request most recent head 5424ecd. Consider uploading reports for the commit 5424ecd to get more accurate results

@@           Coverage Diff           @@
##           master     #781   +/-   ##
=======================================
  Coverage   75.59%   75.59%           
=======================================
  Files          16       16           
  Lines        1254     1254           
  Branches      322      322           
=======================================
  Hits          948      948           
  Misses        220      220           
  Partials       86       86           

---

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 1570f49...5424ecd. Read the comment docs.