Mercurial > hg-stable
changeset 43460:b6c7475595db stable
remotefilelog: use the correct redirection in tests
The test were using '2>%1' which just redirect stderr in the "%1" file. The
intend was '2>&1' which redirect stderr on stdin.
This impact tests because some commit were picking up this '%1' files.
Differential Revision: https://phab.mercurial-scm.org/D7588
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Mon, 09 Dec 2019 11:45:17 +0100 |
| parents | fac25de8cbec |
| children | 4f40dc190f63 |
| files | tests/test-remotefilelog-bgprefetch.t |
| diffstat | 1 files changed, 15 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-remotefilelog-bgprefetch.t Mon Dec 09 10:09:40 2019 +0100 +++ b/tests/test-remotefilelog-bgprefetch.t Mon Dec 09 11:45:17 2019 +0100 @@ -79,7 +79,7 @@ new changesets 6b4b6f66ef8c (run 'hg update' to get a working copy) prefetching file contents - $ hg debugwaitonprefetch >/dev/null 2>%1 + $ hg debugwaitonprefetch >/dev/null 2>&1 $ find $CACHEDIR -type f | sort $TESTTMP/hgcache/master/11/f6ad8ec52a2984abaafd7c3b516503785c2072/ef95c5376f34698742fe34f315fd82136f8f68c0 $TESTTMP/hgcache/master/95/cb0bfd2977c761298d9624e4b4d4c72a39974a/076f5e2225b3ff0400b98c92aa6cdf403ee24cca @@ -107,8 +107,8 @@ new changesets 6b4b6f66ef8c (run 'hg update' to get a working copy) prefetching file contents - $ hg debugwaitonprefetch >/dev/null 2>%1 - $ hg debugwaitonrepack >/dev/null 2>%1 + $ hg debugwaitonprefetch >/dev/null 2>&1 + $ hg debugwaitonrepack >/dev/null 2>&1 $ find $CACHEDIR -type f | sort $TESTTMP/hgcache/master/packs/6e8633deba6e544e5f8edbd7b996d6e31a2c42ae.histidx $TESTTMP/hgcache/master/packs/6e8633deba6e544e5f8edbd7b996d6e31a2c42ae.histpack @@ -140,8 +140,8 @@ $ hg up -r 0 1 files updated, 0 files merged, 1 files removed, 0 files unresolved * files fetched over * fetches - (* misses, 0.00% hit ratio) over *s (glob) - $ hg debugwaitonprefetch >/dev/null 2>%1 - $ hg debugwaitonrepack >/dev/null 2>%1 + $ hg debugwaitonprefetch >/dev/null 2>&1 + $ hg debugwaitonrepack >/dev/null 2>&1 $ find $CACHEDIR -type f | sort $TESTTMP/hgcache/master/packs/8f1443d44e57fec96f72fb2412e01d2818767ef2.histidx $TESTTMP/hgcache/master/packs/8f1443d44e57fec96f72fb2412e01d2818767ef2.histpack @@ -189,8 +189,8 @@ $ hg commit -qAm b * files fetched over 1 fetches - (* misses, 0.00% hit ratio) over *s (glob) $ hg bookmark temporary - $ hg debugwaitonprefetch >/dev/null 2>%1 - $ hg debugwaitonrepack >/dev/null 2>%1 + $ hg debugwaitonprefetch >/dev/null 2>&1 + $ hg debugwaitonrepack >/dev/null 2>&1 $ find $CACHEDIR -type f | sort $TESTTMP/hgcache/master/packs/8f1443d44e57fec96f72fb2412e01d2818767ef2.histidx $TESTTMP/hgcache/master/packs/8f1443d44e57fec96f72fb2412e01d2818767ef2.histpack @@ -228,16 +228,16 @@ # background prefetch with repack on rebase when wcprevset configured $ hg up -r 2 - 3 files updated, 0 files merged, 3 files removed, 0 files unresolved + 3 files updated, 0 files merged, 2 files removed, 0 files unresolved (leaving bookmark temporary) $ clearcache $ find $CACHEDIR -type f | sort $ hg rebase -s temporary -d foo - rebasing 3:58147a5b5242 "b" (temporary tip) - saved backup bundle to $TESTTMP/shallow/.hg/strip-backup/58147a5b5242-c3678817-rebase.hg + rebasing 3:d9cf06e3b5b6 "b" (temporary tip) + saved backup bundle to $TESTTMP/shallow/.hg/strip-backup/d9cf06e3b5b6-e5c3dc63-rebase.hg 3 files fetched over 1 fetches - (3 misses, 0.00% hit ratio) over *s (glob) - $ hg debugwaitonprefetch >/dev/null 2>%1 - $ hg debugwaitonrepack >/dev/null 2>%1 + $ hg debugwaitonprefetch >/dev/null 2>&1 + $ hg debugwaitonrepack >/dev/null 2>&1 # Ensure that file 'y' was prefetched - it was not part of the rebase operation and therefore # could only be downloaded by the background prefetch @@ -269,7 +269,7 @@ # Check that foregound prefetch with no arguments blocks until background prefetches finish $ hg up -r 3 - 2 files updated, 0 files merged, 0 files removed, 0 files unresolved + 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) (?) @@ -277,7 +277,7 @@ (running background incremental repack) * files fetched over 1 fetches - (* misses, 0.00% hit ratio) over *s (glob) (?) - $ hg debugwaitonrepack >/dev/null 2>%1 + $ hg debugwaitonrepack >/dev/null 2>&1 $ find $CACHEDIR -type f | sort $TESTTMP/hgcache/master/packs/8f1443d44e57fec96f72fb2412e01d2818767ef2.histidx @@ -319,7 +319,7 @@ got lock after * seconds (glob) (?) (running background incremental repack) * files fetched over 1 fetches - (* misses, 0.00% hit ratio) over *s (glob) (?) - $ hg debugwaitonrepack >/dev/null 2>%1 + $ hg debugwaitonrepack >/dev/null 2>&1 $ find $CACHEDIR -type f | sort $TESTTMP/hgcache/master/packs/8f1443d44e57fec96f72fb2412e01d2818767ef2.histidx