# HG changeset patch # User Pierre-Yves David # Date 2023-02-16 19:33:14 # Node ID 983e2db18d67e8cd27323616ba195e5bd36553df # Parent b5ecd0bcbcd76283ff1fd19b284ff42cecaa1211 test: fix the flakyness in test-remotefilelog-local.t I now get about 80% of my `test-chg` CI run that fails on flakyness in this tests. It turns out this is only ambiguous status that end up doing file download. So… calling status early will do that potential download separately and the calls we scrutinize during that test will be just fine. diff --git a/tests/test-remotefilelog-local.t b/tests/test-remotefilelog-local.t --- a/tests/test-remotefilelog-local.t +++ b/tests/test-remotefilelog-local.t @@ -77,6 +77,11 @@ n 644 2 * z (glob) $ echo xxxx > x $ echo yyyy > y +# run status early to avoid a flaky second fetch during commit. + $ hg st + M x + M y + \d+ files fetched over \d+ fetches .* (re) (?) $ hg commit -m x created new head 2 files fetched over 1 fetches - (2 misses, 0.00% hit ratio) over *s (glob) @@ -104,6 +109,9 @@ new changesets fed61014d323 (run 'hg heads' to see heads, 'hg merge' to merge) +# run status early to avoid a flaky second fetch during commit + $ hg status + \d+ files fetched over \d+ fetches .* (re) (?) $ hg rebase -d tip rebasing 1:9abfe7bca547 "a" saved backup bundle to $TESTTMP/shallow/.hg/strip-backup/9abfe7bca547-8b11e5ff-rebase.hg (glob)