This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7588

remotefilelog: use the correct redirection in tests
ClosedPublic

Authored by marmoute on Dec 9 2019, 8:02 AM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHGb6c7475595db: remotefilelog: use the correct redirection in tests
Summary

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.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

marmoute created this revision.Dec 9 2019, 8:02 AM

target is the stable-branch

durin42 accepted this revision.Dec 9 2019, 10:14 AM
This revision is now accepted and ready to land.Dec 9 2019, 10:14 AM
marmoute added a commit: rHGb6c7475595db: remotefilelog: use the correct redirection in tests.Dec 11 2019, 12:28 PM
Closed by commit rHGb6c7475595db: remotefilelog: use the correct redirection in tests (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 18613

tests/test-remotefilelog-bgprefetch.t

adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
updating bookmark foo updating bookmark foo
added 1 changesets with 0 changes to 0 files added 1 changesets with 0 changes to 0 files
new changesets 6b4b6f66ef8c new changesets 6b4b6f66ef8c
(run 'hg update' to get a working copy) (run 'hg update' to get a working copy)
prefetching file contents prefetching file contents
$ hg debugwaitonprefetch >/dev/null 2>%1 $ hg debugwaitonprefetch >/dev/null 2>&1
$ find $CACHEDIR -type f | sort $ find $CACHEDIR -type f | sort
$TESTTMP/hgcache/master/11/f6ad8ec52a2984abaafd7c3b516503785c2072/ef95c5376f34698742fe34f315fd82136f8f68c0 $TESTTMP/hgcache/master/11/f6ad8ec52a2984abaafd7c3b516503785c2072/ef95c5376f34698742fe34f315fd82136f8f68c0
$TESTTMP/hgcache/master/95/cb0bfd2977c761298d9624e4b4d4c72a39974a/076f5e2225b3ff0400b98c92aa6cdf403ee24cca $TESTTMP/hgcache/master/95/cb0bfd2977c761298d9624e4b4d4c72a39974a/076f5e2225b3ff0400b98c92aa6cdf403ee24cca
$TESTTMP/hgcache/master/af/f024fe4ab0fece4091de044c58c9ae4233383a/bb6ccd5dceaa5e9dc220e0dad65e051b94f69a2c $TESTTMP/hgcache/master/af/f024fe4ab0fece4091de044c58c9ae4233383a/bb6ccd5dceaa5e9dc220e0dad65e051b94f69a2c
$TESTTMP/hgcache/repos $TESTTMP/hgcache/repos
# background prefetch with repack on pull when configured # background prefetch with repack on pull when configured
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
updating bookmark foo updating bookmark foo
added 1 changesets with 0 changes to 0 files added 1 changesets with 0 changes to 0 files
new changesets 6b4b6f66ef8c new changesets 6b4b6f66ef8c
(run 'hg update' to get a working copy) (run 'hg update' to get a working copy)
prefetching file contents prefetching file contents
$ hg debugwaitonprefetch >/dev/null 2>%1 $ hg debugwaitonprefetch >/dev/null 2>&1
$ hg debugwaitonrepack >/dev/null 2>%1 $ hg debugwaitonrepack >/dev/null 2>&1
$ find $CACHEDIR -type f | sort $ find $CACHEDIR -type f | sort
$TESTTMP/hgcache/master/packs/6e8633deba6e544e5f8edbd7b996d6e31a2c42ae.histidx $TESTTMP/hgcache/master/packs/6e8633deba6e544e5f8edbd7b996d6e31a2c42ae.histidx
$TESTTMP/hgcache/master/packs/6e8633deba6e544e5f8edbd7b996d6e31a2c42ae.histpack $TESTTMP/hgcache/master/packs/6e8633deba6e544e5f8edbd7b996d6e31a2c42ae.histpack
$TESTTMP/hgcache/master/packs/8ce5ab3745465ab83bba30a7b9c295e0c8404652.dataidx $TESTTMP/hgcache/master/packs/8ce5ab3745465ab83bba30a7b9c295e0c8404652.dataidx
$TESTTMP/hgcache/master/packs/8ce5ab3745465ab83bba30a7b9c295e0c8404652.datapack $TESTTMP/hgcache/master/packs/8ce5ab3745465ab83bba30a7b9c295e0c8404652.datapack
$TESTTMP/hgcache/repos $TESTTMP/hgcache/repos
# background prefetch with repack on update when wcprevset configured # background prefetch with repack on update when wcprevset configured
> [remotefilelog] > [remotefilelog]
> bgprefetchrevs=.:: > bgprefetchrevs=.::
> EOF > EOF
$ clearcache $ clearcache
$ hg up -r 0 $ hg up -r 0
1 files updated, 0 files merged, 1 files removed, 0 files unresolved 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
* files fetched over * fetches - (* misses, 0.00% hit ratio) over *s (glob) * files fetched over * fetches - (* misses, 0.00% hit ratio) over *s (glob)
$ hg debugwaitonprefetch >/dev/null 2>%1 $ hg debugwaitonprefetch >/dev/null 2>&1
$ hg debugwaitonrepack >/dev/null 2>%1 $ hg debugwaitonrepack >/dev/null 2>&1
$ find $CACHEDIR -type f | sort $ find $CACHEDIR -type f | sort
$TESTTMP/hgcache/master/packs/8f1443d44e57fec96f72fb2412e01d2818767ef2.histidx $TESTTMP/hgcache/master/packs/8f1443d44e57fec96f72fb2412e01d2818767ef2.histidx
$TESTTMP/hgcache/master/packs/8f1443d44e57fec96f72fb2412e01d2818767ef2.histpack $TESTTMP/hgcache/master/packs/8f1443d44e57fec96f72fb2412e01d2818767ef2.histpack
$TESTTMP/hgcache/master/packs/f4d50848e0b465e9bfd2875f213044c06cfd7407.dataidx $TESTTMP/hgcache/master/packs/f4d50848e0b465e9bfd2875f213044c06cfd7407.dataidx
$TESTTMP/hgcache/master/packs/f4d50848e0b465e9bfd2875f213044c06cfd7407.datapack $TESTTMP/hgcache/master/packs/f4d50848e0b465e9bfd2875f213044c06cfd7407.datapack
$TESTTMP/hgcache/repos $TESTTMP/hgcache/repos
# Ensure that file 'w' was prefetched - it was not part of the update operation and therefore # Ensure that file 'w' was prefetched - it was not part of the update operation and therefore
> EOF > EOF
$ clearcache $ clearcache
$ find $CACHEDIR -type f | sort $ find $CACHEDIR -type f | sort
$ echo b > b $ echo b > b
$ hg commit -qAm b $ hg commit -qAm b
* files fetched over 1 fetches - (* misses, 0.00% hit ratio) over *s (glob) * files fetched over 1 fetches - (* misses, 0.00% hit ratio) over *s (glob)
$ hg bookmark temporary $ hg bookmark temporary
$ hg debugwaitonprefetch >/dev/null 2>%1 $ hg debugwaitonprefetch >/dev/null 2>&1
$ hg debugwaitonrepack >/dev/null 2>%1 $ hg debugwaitonrepack >/dev/null 2>&1
$ find $CACHEDIR -type f | sort $ find $CACHEDIR -type f | sort
$TESTTMP/hgcache/master/packs/8f1443d44e57fec96f72fb2412e01d2818767ef2.histidx $TESTTMP/hgcache/master/packs/8f1443d44e57fec96f72fb2412e01d2818767ef2.histidx
$TESTTMP/hgcache/master/packs/8f1443d44e57fec96f72fb2412e01d2818767ef2.histpack $TESTTMP/hgcache/master/packs/8f1443d44e57fec96f72fb2412e01d2818767ef2.histpack
$TESTTMP/hgcache/master/packs/f4d50848e0b465e9bfd2875f213044c06cfd7407.dataidx $TESTTMP/hgcache/master/packs/f4d50848e0b465e9bfd2875f213044c06cfd7407.dataidx
$TESTTMP/hgcache/master/packs/f4d50848e0b465e9bfd2875f213044c06cfd7407.datapack $TESTTMP/hgcache/master/packs/f4d50848e0b465e9bfd2875f213044c06cfd7407.datapack
$TESTTMP/hgcache/repos $TESTTMP/hgcache/repos
# Ensure that file 'w' was prefetched - it was not part of the commit operation and therefore # Ensure that file 'w' was prefetched - it was not part of the commit operation and therefore
Node Delta Base Delta Length Blob Size Node Delta Base Delta Length Blob Size
69a1b6752270 000000000000 2 2 69a1b6752270 000000000000 2 2
Total: 2 2 (0.0% bigger) Total: 2 2 (0.0% bigger)
# background prefetch with repack on rebase when wcprevset configured # background prefetch with repack on rebase when wcprevset configured
$ hg up -r 2 $ 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) (leaving bookmark temporary)
$ clearcache $ clearcache
$ find $CACHEDIR -type f | sort $ find $CACHEDIR -type f | sort
$ hg rebase -s temporary -d foo $ hg rebase -s temporary -d foo
rebasing 3:58147a5b5242 "b" (temporary tip) rebasing 3:d9cf06e3b5b6 "b" (temporary tip)
saved backup bundle to $TESTTMP/shallow/.hg/strip-backup/58147a5b5242-c3678817-rebase.hg 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) 3 files fetched over 1 fetches - (3 misses, 0.00% hit ratio) over *s (glob)
$ hg debugwaitonprefetch >/dev/null 2>%1 $ hg debugwaitonprefetch >/dev/null 2>&1
$ hg debugwaitonrepack >/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 # Ensure that file 'y' was prefetched - it was not part of the rebase operation and therefore
# could only be downloaded by the background prefetch # could only be downloaded by the background prefetch
$ hg debugdatapack `ls -ct $TESTTMP/hgcache/master/packs/*.datapack | head -n 1` $ hg debugdatapack `ls -ct $TESTTMP/hgcache/master/packs/*.datapack | head -n 1`
$TESTTMP/hgcache/master/packs/f4d50848e0b465e9bfd2875f213044c06cfd7407: $TESTTMP/hgcache/master/packs/f4d50848e0b465e9bfd2875f213044c06cfd7407:
w: w:
Node Delta Base Delta Length Blob Size Node Delta Base Delta Length Blob Size
Node Delta Base Delta Length Blob Size Node Delta Base Delta Length Blob Size
69a1b6752270 000000000000 2 2 69a1b6752270 000000000000 2 2
Total: 2 2 (0.0% bigger) Total: 2 2 (0.0% bigger)
# Check that foregound prefetch with no arguments blocks until background prefetches finish # Check that foregound prefetch with no arguments blocks until background prefetches finish
$ hg up -r 3 $ 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 $ clearcache
$ hg prefetch --repack $ hg prefetch --repack
waiting for lock on prefetching in $TESTTMP/shallow held by process * on host * (glob) (?) waiting for lock on prefetching in $TESTTMP/shallow held by process * on host * (glob) (?)
got lock after * seconds (glob) (?) got lock after * seconds (glob) (?)
(running background incremental repack) (running background incremental repack)
* files fetched over 1 fetches - (* misses, 0.00% hit ratio) over *s (glob) (?) * 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 $ find $CACHEDIR -type f | sort
$TESTTMP/hgcache/master/packs/8f1443d44e57fec96f72fb2412e01d2818767ef2.histidx $TESTTMP/hgcache/master/packs/8f1443d44e57fec96f72fb2412e01d2818767ef2.histidx
$TESTTMP/hgcache/master/packs/8f1443d44e57fec96f72fb2412e01d2818767ef2.histpack $TESTTMP/hgcache/master/packs/8f1443d44e57fec96f72fb2412e01d2818767ef2.histpack
$TESTTMP/hgcache/master/packs/f4d50848e0b465e9bfd2875f213044c06cfd7407.dataidx $TESTTMP/hgcache/master/packs/f4d50848e0b465e9bfd2875f213044c06cfd7407.dataidx
$TESTTMP/hgcache/master/packs/f4d50848e0b465e9bfd2875f213044c06cfd7407.datapack $TESTTMP/hgcache/master/packs/f4d50848e0b465e9bfd2875f213044c06cfd7407.datapack
$TESTTMP/hgcache/repos $TESTTMP/hgcache/repos
# Check that foreground prefetch fetches revs specified by '. + draft() + bgprefetchrevs + pullprefetch' # Check that foreground prefetch fetches revs specified by '. + draft() + bgprefetchrevs + pullprefetch'
$ clearcache $ clearcache
$ hg prefetch --repack $ hg prefetch --repack
waiting for lock on prefetching in $TESTTMP/shallow held by process * on host * (glob) (?) waiting for lock on prefetching in $TESTTMP/shallow held by process * on host * (glob) (?)
got lock after * seconds (glob) (?) got lock after * seconds (glob) (?)
(running background incremental repack) (running background incremental repack)
* files fetched over 1 fetches - (* misses, 0.00% hit ratio) over *s (glob) (?) * 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 $ find $CACHEDIR -type f | sort
$TESTTMP/hgcache/master/packs/8f1443d44e57fec96f72fb2412e01d2818767ef2.histidx $TESTTMP/hgcache/master/packs/8f1443d44e57fec96f72fb2412e01d2818767ef2.histidx
$TESTTMP/hgcache/master/packs/8f1443d44e57fec96f72fb2412e01d2818767ef2.histpack $TESTTMP/hgcache/master/packs/8f1443d44e57fec96f72fb2412e01d2818767ef2.histpack
$TESTTMP/hgcache/master/packs/f4d50848e0b465e9bfd2875f213044c06cfd7407.dataidx $TESTTMP/hgcache/master/packs/f4d50848e0b465e9bfd2875f213044c06cfd7407.dataidx
$TESTTMP/hgcache/master/packs/f4d50848e0b465e9bfd2875f213044c06cfd7407.datapack $TESTTMP/hgcache/master/packs/f4d50848e0b465e9bfd2875f213044c06cfd7407.datapack
$TESTTMP/hgcache/repos $TESTTMP/hgcache/repos