Patchwork [FOLLOW-UP] test: follow-up on 1c4d6ab2ecb8, stabilize test-remotefilelog-bgprefetch.t

login
register
mail settings
Submitter Boris Feld
Date Feb. 25, 2019, 8:08 a.m.
Message ID <f611bf911c863d35aced.1551082131@localhost.localdomain>
Download mbox | patch
Permalink /patch/38925/
State Accepted
Headers show

Comments

Boris Feld - Feb. 25, 2019, 8:08 a.m.
# HG changeset patch
# User Boris Feld <boris.feld@octobus.net>
# Date 1551081749 -3600
#      lun. févr. 25 09:02:29 2019 +0100
# Node ID f611bf911c863d35aced20dfb2546725c911a722
# Parent  1c1c4ef8b72e39f5ed1c62dc4e31e02e9e08b652
# EXP-Topic stabilize-test-remotefilelog-bgprefetch.t
# Available At https://bitbucket.org/octobus/mercurial-devel/
#              hg pull https://bitbucket.org/octobus/mercurial-devel/ -r f611bf911c86
test: follow-up on 1c4d6ab2ecb8, stabilize test-remotefilelog-bgprefetch.t

In 1c4d6ab2ecb8, I've added some sleeps after about half of the calls to `hg
debugwaitonrepack` but it seems the other calls are also flaky as catched by
our CI: https://ci.octobus.net/job/MercurialPy2/299/console. Add sleeps after
all calls in order to be safe.
Yuya Nishihara - Feb. 28, 2019, 12:40 a.m.
On Mon, 25 Feb 2019 09:08:51 +0100, Boris Feld wrote:
> # HG changeset patch
> # User Boris Feld <boris.feld@octobus.net>
> # Date 1551081749 -3600
> #      lun. févr. 25 09:02:29 2019 +0100
> # Node ID f611bf911c863d35aced20dfb2546725c911a722
> # Parent  1c1c4ef8b72e39f5ed1c62dc4e31e02e9e08b652
> # EXP-Topic stabilize-test-remotefilelog-bgprefetch.t
> # Available At https://bitbucket.org/octobus/mercurial-devel/
> #              hg pull https://bitbucket.org/octobus/mercurial-devel/ -r f611bf911c86
> test: follow-up on 1c4d6ab2ecb8, stabilize test-remotefilelog-bgprefetch.t

Queued, thanks.

Patch

diff --git a/tests/test-remotefilelog-bgprefetch.t b/tests/test-remotefilelog-bgprefetch.t
--- a/tests/test-remotefilelog-bgprefetch.t
+++ b/tests/test-remotefilelog-bgprefetch.t
@@ -142,6 +142,7 @@ 
   $ hg debugwaitonprefetch >/dev/null 2>%1
   $ sleep 1
   $ hg debugwaitonrepack >/dev/null 2>%1
+  $ sleep 1
   $ find $CACHEDIR -type f | sort
   $TESTTMP/hgcache/master/packs/8f1443d44e57fec96f72fb2412e01d2818767ef2.histidx
   $TESTTMP/hgcache/master/packs/8f1443d44e57fec96f72fb2412e01d2818767ef2.histpack
@@ -287,6 +288,7 @@ 
 
   $ sleep 0.5
   $ hg debugwaitonrepack >/dev/null 2>%1
+  $ sleep 0.5
 
   $ find $CACHEDIR -type f | sort
   $TESTTMP/hgcache/master/packs/8f1443d44e57fec96f72fb2412e01d2818767ef2.histidx
@@ -331,6 +333,7 @@ 
   * files fetched over 1 fetches - (* misses, 0.00% hit ratio) over *s (glob) (?)
   $ sleep 0.5
   $ hg debugwaitonrepack >/dev/null 2>%1
+  $ sleep 0.5
 
   $ find $CACHEDIR -type f | sort
   $TESTTMP/hgcache/master/packs/8f1443d44e57fec96f72fb2412e01d2818767ef2.histidx