Patchwork D9505: tests: explicitly skip the lock warning in some remotefilelog tests

login
register
mail settings
Submitter phabricator
Date Dec. 2, 2020, 10:19 p.m.
Message ID <differential-rev-PHID-DREV-zpcg4udeep4p547zc2fk-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/47786/
State Superseded
Headers show

Comments

phabricator - Dec. 2, 2020, 10:19 p.m.
marmoute created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REVISION SUMMARY
  The output was conditional zed, so lets official skip it instead.

REPOSITORY
  rHG Mercurial

BRANCH
  default

REVISION DETAIL
  https://phab.mercurial-scm.org/D9505

AFFECTED FILES
  tests/test-remotefilelog-bgprefetch.t

CHANGE DETAILS




To: marmoute, #hg-reviewers
Cc: mercurial-patches, mercurial-devel

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
@@ -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) (?)