changeset 46013:7a79548954b3

tests: explicitly skip the lock warning in some remotefilelog tests The output was conditional zed, so lets official skip it instead. Differential Revision: https://phab.mercurial-scm.org/D9505
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Wed, 02 Dec 2020 20:10:22 +0100
parents d72378f93a44
children b86608e97fa8
files tests/test-remotefilelog-bgprefetch.t
diffstat 1 files changed, 2 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-remotefilelog-bgprefetch.t	Wed Dec 02 20:02:35 2020 +0100
+++ b/tests/test-remotefilelog-bgprefetch.t	Wed Dec 02 20:10:22 2020 +0100
@@ -271,9 +271,7 @@
   $ hg up -r 3
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ clearcache
-  $ hg prefetch --repack
-  waiting for lock on prefetching in $TESTTMP/shallow held by process * on host * (glob) (?)
-  got lock after * seconds (glob) (?)
+  $ hg prefetch --repack --config ui.timeout.warn=-1
   (running background incremental repack)
   * files fetched over 1 fetches - (* misses, 0.00% hit ratio) over *s (glob) (?)
 
@@ -312,9 +310,7 @@
 # Check that foreground prefetch fetches revs specified by '. + draft() + bgprefetchrevs + pullprefetch'
 
   $ clearcache
-  $ hg prefetch --repack
-  waiting for lock on prefetching in $TESTTMP/shallow held by process * on host * (glob) (?)
-  got lock after * seconds (glob) (?)
+  $ hg prefetch --repack --config ui.timeout.warn=-1
   (running background incremental repack)
   * files fetched over 1 fetches - (* misses, 0.00% hit ratio) over *s (glob) (?)