This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4942

remotefilelog: avoid hard-coding pack names in tests
ClosedPublic

Authored by durin42 on Oct 11 2018, 8:21 AM.

Download Raw Diff

Details

Reviewers

indygreg

Group Reviewers

hg-reviewers

Commits

rHGb6b2a3d22344: remotefilelog: avoid hard-coding pack names in tests

Summary

I'm about to alter the pack format, which alters the content-addressed
name of the pack file. In order to reduce my own confusion I found it
helpful to use an ls | head pipeline since we always want to inspect
the newest pack.

Diff Detail

Repository

rHG Mercurial

Lint

Lint Skipped

Unit

Unit Tests Skipped

Event Timeline

durin42 created this revision.Oct 11 2018, 8:21 AM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptOct 11 2018, 8:21 AM

Herald added a subscriber: mercurial-devel. · View Herald Transcript

durin42 added a child revision: D4943: remotefilelog: bump pack file formats to version 2.Oct 11 2018, 8:21 AM

indygreg accepted this revision.Oct 11 2018, 9:35 AM

This revision is now accepted and ready to land.Oct 11 2018, 9:35 AM

durin42 removed a parent revision: D4941: remotefilelog: jettison example cache client.Oct 16 2018, 5:54 PM

durin42 added a parent revision: D5124: remotefilelog: remove now-unused wirepack code.

Closed by commit rHGb6b2a3d22344: remotefilelog: avoid hard-coding pack names in tests (authored by durin42). · Explain WhyNov 5 2018, 2:53 PM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			tests/test-remotefilelog-bgprefetch.t (10 lines)
M			tests/test-remotefilelog-gcrepack.t (8 lines)

Commit	Parents	Author	Summary	Date
		Augie Fackler		Oct 3 2018, 11:47 PM

Status	Author	Revision
Closed	pulkit	D5193 remotefilelog: drop compat code for "getbundle_shallow" wireprotocol command
Closed	pulkit	D5192 tests: remove lz4 as dependency while running tests
Closed	pulkit	D5191 remotefilelogserver: add a matcher argument to _walkstreamfiles()
Closed	pulkit	D5190 shallowutil: introduce a helper function isenabled()
Closed	pulkit	D5189 remotefilelog: remove some BC code related to streamclone
Closed	durin42	D5131 remotefilelog: add some docstring
Closed	durin42	D5129 remotefilelog: rename wireproto methods and remaining capabilities
Closed	durin42	D5128 remotefilelog: consolidate and rename on-disk store requirement
Closed	durin42	D5127 remotefilelog: consolidate and rename bundle2 capability
Closed	durin42	D5126 remotefilelog: rename capability for legacy ssh file fetching method
Closed	durin42	D4944 remotefilelog: rip out lz4 support
Closed	durin42	D4943 remotefilelog: bump pack file formats to version 2
Closed	durin42	D4942 remotefilelog: avoid hard-coding pack names in tests
Closed	durin42	D5124 remotefilelog: remove now-unused wirepack code
Closed	durin42	D5123 remotefilelogserver: remove pack-serving functionality
Closed	durin42	D5122 remotefilelog: remove support for fetching packs
Closed	durin42	D4941 remotefilelog: jettison example cache client
Closed	durin42	D4940 remotefilelog: prune obsolete method
Closed	durin42	D4939 logtoprocess: use new runbgcommand from procutil
Closed	durin42	D5121 procutil: port over windows encoding fixes from logtoprocess
Closed	durin42	D4938 remotefilelog: transplant runbgcommand to procutil
Closed	durin42	D4937 remotefilelog: remove function that was described as deprecated
Closed	durin42	D4782 remotefilelog: import pruned-down remotefilelog extension from hg-experimental

Diff 11808

tests/test-remotefilelog-bgprefetch.t

	$TESTTMP/hgcache/master/packs/8299d5a1030f073f4adbb3b6bd2ad3bdcc276df0.dataidx			$TESTTMP/hgcache/master/packs/8299d5a1030f073f4adbb3b6bd2ad3bdcc276df0.dataidx
	$TESTTMP/hgcache/master/packs/8299d5a1030f073f4adbb3b6bd2ad3bdcc276df0.datapack			$TESTTMP/hgcache/master/packs/8299d5a1030f073f4adbb3b6bd2ad3bdcc276df0.datapack
	$TESTTMP/hgcache/master/packs/repacklock			$TESTTMP/hgcache/master/packs/repacklock
	$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
	# could only be downloaded by the background prefetch			# could only be downloaded by the background prefetch

	$ hg debugdatapack $TESTTMP/hgcache/master/packs/8299d5a1030f073f4adbb3b6bd2ad3bdcc276df0.datapack			$ hg debugdatapack `ls -ct $TESTTMP/hgcache/master/packs/*.datapack \| head -n 1`
	$TESTTMP/hgcache/master/packs/8299d5a1030f073f4adbb3b6bd2ad3bdcc276df0:			$TESTTMP/hgcache/master/packs/8299d5a1030f073f4adbb3b6bd2ad3bdcc276df0:
	w:			w:
	Node Delta Base Delta Length Blob Size			Node Delta Base Delta Length Blob Size
	bb6ccd5dceaa 000000000000 2 2			bb6ccd5dceaa 000000000000 2 2

	Total: 2 2 (0.0% bigger)			Total: 2 2 (0.0% bigger)
	x:			x:
	Node Delta Base Delta Length Blob Size			Node Delta Base Delta Length Blob Size
	$TESTTMP/hgcache/master/packs/8299d5a1030f073f4adbb3b6bd2ad3bdcc276df0.dataidx			$TESTTMP/hgcache/master/packs/8299d5a1030f073f4adbb3b6bd2ad3bdcc276df0.dataidx
	$TESTTMP/hgcache/master/packs/8299d5a1030f073f4adbb3b6bd2ad3bdcc276df0.datapack			$TESTTMP/hgcache/master/packs/8299d5a1030f073f4adbb3b6bd2ad3bdcc276df0.datapack
	$TESTTMP/hgcache/master/packs/repacklock			$TESTTMP/hgcache/master/packs/repacklock
	$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
	# could only be downloaded by the background prefetch			# could only be downloaded by the background prefetch

	$ hg debugdatapack $TESTTMP/hgcache/master/packs/8299d5a1030f073f4adbb3b6bd2ad3bdcc276df0.datapack			$ hg debugdatapack `ls -ct $TESTTMP/hgcache/master/packs/*.datapack \| head -n 1`
	$TESTTMP/hgcache/master/packs/8299d5a1030f073f4adbb3b6bd2ad3bdcc276df0:			$TESTTMP/hgcache/master/packs/8299d5a1030f073f4adbb3b6bd2ad3bdcc276df0:
	w:			w:
	Node Delta Base Delta Length Blob Size			Node Delta Base Delta Length Blob Size
	bb6ccd5dceaa 000000000000 2 2			bb6ccd5dceaa 000000000000 2 2

	Total: 2 2 (0.0% bigger)			Total: 2 2 (0.0% bigger)
	x:			x:
	Node Delta Base Delta Length Blob Size			Node Delta Base Delta Length Blob Size
	$ sleep 1			$ sleep 1
	$ hg debugwaitonprefetch >/dev/null 2>%1			$ hg debugwaitonprefetch >/dev/null 2>%1
	$ sleep 1			$ sleep 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 $TESTTMP/hgcache/master/packs/8299d5a1030f073f4adbb3b6bd2ad3bdcc276df0.datapack			$ hg debugdatapack `ls -ct $TESTTMP/hgcache/master/packs/*.datapack \| head -n 1`
	$TESTTMP/hgcache/master/packs/8299d5a1030f073f4adbb3b6bd2ad3bdcc276df0:			$TESTTMP/hgcache/master/packs/8299d5a1030f073f4adbb3b6bd2ad3bdcc276df0:
	w:			w:
	Node Delta Base Delta Length Blob Size			Node Delta Base Delta Length Blob Size
	bb6ccd5dceaa 000000000000 2 2			bb6ccd5dceaa 000000000000 2 2

	Total: 2 2 (0.0% bigger)			Total: 2 2 (0.0% bigger)
	x:			x:
	Node Delta Base Delta Length Blob Size			Node Delta Base Delta Length Blob Size
	$TESTTMP/hgcache/master/packs/27c52c105a1ddf8c75143a6b279b04c24b1f4bee.histidx			$TESTTMP/hgcache/master/packs/27c52c105a1ddf8c75143a6b279b04c24b1f4bee.histidx
	$TESTTMP/hgcache/master/packs/27c52c105a1ddf8c75143a6b279b04c24b1f4bee.histpack			$TESTTMP/hgcache/master/packs/27c52c105a1ddf8c75143a6b279b04c24b1f4bee.histpack
	$TESTTMP/hgcache/master/packs/8299d5a1030f073f4adbb3b6bd2ad3bdcc276df0.dataidx			$TESTTMP/hgcache/master/packs/8299d5a1030f073f4adbb3b6bd2ad3bdcc276df0.dataidx
	$TESTTMP/hgcache/master/packs/8299d5a1030f073f4adbb3b6bd2ad3bdcc276df0.datapack			$TESTTMP/hgcache/master/packs/8299d5a1030f073f4adbb3b6bd2ad3bdcc276df0.datapack
	$TESTTMP/hgcache/master/packs/repacklock			$TESTTMP/hgcache/master/packs/repacklock
	$TESTTMP/hgcache/repos			$TESTTMP/hgcache/repos

	# Ensure that files were prefetched			# Ensure that files were prefetched
	$ hg debugdatapack $TESTTMP/hgcache/master/packs/8299d5a1030f073f4adbb3b6bd2ad3bdcc276df0.datapack			$ hg debugdatapack `ls -ct $TESTTMP/hgcache/master/packs/*.datapack \| head -n 1`
	$TESTTMP/hgcache/master/packs/8299d5a1030f073f4adbb3b6bd2ad3bdcc276df0:			$TESTTMP/hgcache/master/packs/8299d5a1030f073f4adbb3b6bd2ad3bdcc276df0:
	w:			w:
	Node Delta Base Delta Length Blob Size			Node Delta Base Delta Length Blob Size
	bb6ccd5dceaa 000000000000 2 2			bb6ccd5dceaa 000000000000 2 2

	Total: 2 2 (0.0% bigger)			Total: 2 2 (0.0% bigger)
	x:			x:
	Node Delta Base Delta Length Blob Size			Node Delta Base Delta Length Blob Size
	$TESTTMP/hgcache/master/packs/27c52c105a1ddf8c75143a6b279b04c24b1f4bee.histidx			$TESTTMP/hgcache/master/packs/27c52c105a1ddf8c75143a6b279b04c24b1f4bee.histidx
	$TESTTMP/hgcache/master/packs/27c52c105a1ddf8c75143a6b279b04c24b1f4bee.histpack			$TESTTMP/hgcache/master/packs/27c52c105a1ddf8c75143a6b279b04c24b1f4bee.histpack
	$TESTTMP/hgcache/master/packs/8299d5a1030f073f4adbb3b6bd2ad3bdcc276df0.dataidx			$TESTTMP/hgcache/master/packs/8299d5a1030f073f4adbb3b6bd2ad3bdcc276df0.dataidx
	$TESTTMP/hgcache/master/packs/8299d5a1030f073f4adbb3b6bd2ad3bdcc276df0.datapack			$TESTTMP/hgcache/master/packs/8299d5a1030f073f4adbb3b6bd2ad3bdcc276df0.datapack
	$TESTTMP/hgcache/master/packs/repacklock			$TESTTMP/hgcache/master/packs/repacklock
	$TESTTMP/hgcache/repos			$TESTTMP/hgcache/repos

	# Ensure that files were prefetched			# Ensure that files were prefetched
	$ hg debugdatapack $TESTTMP/hgcache/master/packs/8299d5a1030f073f4adbb3b6bd2ad3bdcc276df0.datapack			$ hg debugdatapack `ls -ct $TESTTMP/hgcache/master/packs/*.datapack \| head -n 1`
	$TESTTMP/hgcache/master/packs/8299d5a1030f073f4adbb3b6bd2ad3bdcc276df0:			$TESTTMP/hgcache/master/packs/8299d5a1030f073f4adbb3b6bd2ad3bdcc276df0:
	w:			w:
	Node Delta Base Delta Length Blob Size			Node Delta Base Delta Length Blob Size
	bb6ccd5dceaa 000000000000 2 2			bb6ccd5dceaa 000000000000 2 2

	Total: 2 2 (0.0% bigger)			Total: 2 2 (0.0% bigger)
	x:			x:
	Node Delta Base Delta Length Blob Size			Node Delta Base Delta Length Blob Size

tests/test-remotefilelog-gcrepack.t

	$ hg debugwaitonrepack >/dev/null 2>%1			$ hg debugwaitonrepack >/dev/null 2>%1

	$ find $CACHEDIR \| sort \| grep ".datapack\\|.histpack"			$ find $CACHEDIR \| sort \| grep ".datapack\\|.histpack"
	$TESTTMP/hgcache/master/packs/9a2ea858fe2967db9b6ea4c0ca238881cae9d6eb.histpack			$TESTTMP/hgcache/master/packs/9a2ea858fe2967db9b6ea4c0ca238881cae9d6eb.histpack
	$TESTTMP/hgcache/master/packs/f7a942a6e4673d2c7b697fdd926ca2d153831ca4.datapack			$TESTTMP/hgcache/master/packs/f7a942a6e4673d2c7b697fdd926ca2d153831ca4.datapack

	# Ensure that all file versions were prefetched			# Ensure that all file versions were prefetched

	$ hg debugdatapack $TESTTMP/hgcache/master/packs/f7a942a6e4673d2c7b697fdd926ca2d153831ca4.datapack			$ hg debugdatapack `ls -ct $TESTTMP/hgcache/master/packs/*.datapack \| head -n 1`
	$TESTTMP/hgcache/master/packs/f7a942a6e4673d2c7b697fdd926ca2d153831ca4:			$TESTTMP/hgcache/master/packs/f7a942a6e4673d2c7b697fdd926ca2d153831ca4:
	x:			x:
	Node Delta Base Delta Length Blob Size			Node Delta Base Delta Length Blob Size
	1406e7411862 000000000000 2 2			1406e7411862 000000000000 2 2

	Total: 2 2 (0.0% bigger)			Total: 2 2 (0.0% bigger)
	y:			y:
	Node Delta Base Delta Length Blob Size			Node Delta Base Delta Length Blob Size

	$ find $CACHEDIR \| sort \| grep ".datapack\\|.histpack"			$ find $CACHEDIR \| sort \| grep ".datapack\\|.histpack"
	$TESTTMP/hgcache/master/packs/05baa499c6b07f2bf0ea3d2c8151da1cb86f5e33.datapack			$TESTTMP/hgcache/master/packs/05baa499c6b07f2bf0ea3d2c8151da1cb86f5e33.datapack
	$TESTTMP/hgcache/master/packs/9a2ea858fe2967db9b6ea4c0ca238881cae9d6eb.histpack			$TESTTMP/hgcache/master/packs/9a2ea858fe2967db9b6ea4c0ca238881cae9d6eb.histpack

	# Ensure that file 'x' was garbage collected. It should be GCed because it is not in the keepset			# Ensure that file 'x' was garbage collected. It should be GCed because it is not in the keepset
	# and is old (commit date is 0.0 in tests). Ensure that file 'y' is present as it is in the keepset.			# and is old (commit date is 0.0 in tests). Ensure that file 'y' is present as it is in the keepset.

	$ hg debugdatapack $TESTTMP/hgcache/master/packs/05baa499c6b07f2bf0ea3d2c8151da1cb86f5e33.datapack			$ hg debugdatapack `ls -ct $TESTTMP/hgcache/master/packs/*.datapack \| head -n 1`
	$TESTTMP/hgcache/master/packs/05baa499c6b07f2bf0ea3d2c8151da1cb86f5e33:			$TESTTMP/hgcache/master/packs/05baa499c6b07f2bf0ea3d2c8151da1cb86f5e33:
	y:			y:
	Node Delta Base Delta Length Blob Size			Node Delta Base Delta Length Blob Size
	50dbc4572b8e 000000000000 3 3			50dbc4572b8e 000000000000 3 3

	Total: 3 3 (0.0% bigger)			Total: 3 3 (0.0% bigger)

	# Prefetch all data again and repack for later garbage collection			# Prefetch all data again and repack for later garbage collection
	$ hg debugwaitonrepack >/dev/null 2>%1			$ hg debugwaitonrepack >/dev/null 2>%1

	$ find $CACHEDIR \| sort \| grep ".datapack\\|.histpack"			$ find $CACHEDIR \| sort \| grep ".datapack\\|.histpack"
	$TESTTMP/hgcache/master/packs/9a2ea858fe2967db9b6ea4c0ca238881cae9d6eb.histpack			$TESTTMP/hgcache/master/packs/9a2ea858fe2967db9b6ea4c0ca238881cae9d6eb.histpack
	$TESTTMP/hgcache/master/packs/f7a942a6e4673d2c7b697fdd926ca2d153831ca4.datapack			$TESTTMP/hgcache/master/packs/f7a942a6e4673d2c7b697fdd926ca2d153831ca4.datapack

	# Ensure that all file versions were prefetched			# Ensure that all file versions were prefetched

	$ hg debugdatapack $TESTTMP/hgcache/master/packs/f7a942a6e4673d2c7b697fdd926ca2d153831ca4.datapack			$ hg debugdatapack `ls -ct $TESTTMP/hgcache/master/packs/*.datapack \| head -n 1`
	$TESTTMP/hgcache/master/packs/f7a942a6e4673d2c7b697fdd926ca2d153831ca4:			$TESTTMP/hgcache/master/packs/f7a942a6e4673d2c7b697fdd926ca2d153831ca4:
	x:			x:
	Node Delta Base Delta Length Blob Size			Node Delta Base Delta Length Blob Size
	1406e7411862 000000000000 2 2			1406e7411862 000000000000 2 2

	Total: 2 2 (0.0% bigger)			Total: 2 2 (0.0% bigger)
	y:			y:
	Node Delta Base Delta Length Blob Size			Node Delta Base Delta Length Blob Size
	$ hg debugwaitonrepack >/dev/null 2>%1			$ hg debugwaitonrepack >/dev/null 2>%1

	$ find $CACHEDIR \| sort \| grep ".datapack\\|.histpack"			$ find $CACHEDIR \| sort \| grep ".datapack\\|.histpack"
	$TESTTMP/hgcache/master/packs/9a2ea858fe2967db9b6ea4c0ca238881cae9d6eb.histpack			$TESTTMP/hgcache/master/packs/9a2ea858fe2967db9b6ea4c0ca238881cae9d6eb.histpack
	$TESTTMP/hgcache/master/packs/f7a942a6e4673d2c7b697fdd926ca2d153831ca4.datapack			$TESTTMP/hgcache/master/packs/f7a942a6e4673d2c7b697fdd926ca2d153831ca4.datapack

	# Ensure that all file versions were prefetched			# Ensure that all file versions were prefetched

	$ hg debugdatapack $TESTTMP/hgcache/master/packs/f7a942a6e4673d2c7b697fdd926ca2d153831ca4.datapack			$ hg debugdatapack `ls -ct $TESTTMP/hgcache/master/packs/*.datapack \| head -n 1`
	$TESTTMP/hgcache/master/packs/f7a942a6e4673d2c7b697fdd926ca2d153831ca4:			$TESTTMP/hgcache/master/packs/f7a942a6e4673d2c7b697fdd926ca2d153831ca4:
	x:			x:
	Node Delta Base Delta Length Blob Size			Node Delta Base Delta Length Blob Size
	1406e7411862 000000000000 2 2			1406e7411862 000000000000 2 2

	Total: 2 2 (0.0% bigger)			Total: 2 2 (0.0% bigger)
	y:			y:
	Node Delta Base Delta Length Blob Size			Node Delta Base Delta Length Blob Size
	50dbc4572b8e 000000000000 3 3			50dbc4572b8e 000000000000 3 3
	076f5e2225b3 50dbc4572b8e 14 2			076f5e2225b3 50dbc4572b8e 14 2

	Total: 17 5 (240.0% bigger)			Total: 17 5 (240.0% bigger)