This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3039

tests: conditionalize tests based on presence of custom extensions
ClosedPublic

Authored by indygreg on Apr 3 2018, 1:53 PM.

Download Raw Diff

Details

Reviewers

None

Group Reviewers

hg-reviewers

Commits

rHG4e6a6d0dccee: tests: conditionalize tests based on presence of custom extensions

Summary

The test harness supports injecting extensions via --extra-config-opt.
However, if you do this, various tests that print state about loaded
extensions fail.

This commit teaches the test harness to recognize when custom
extensions are loaded so that tests can use feature sniffing to
conditionalize tests based on that.

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

indygreg created this revision.Apr 3 2018, 1:53 PM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptApr 3 2018, 1:53 PM

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

indygreg added a child revision: D3040: tests: skip some tests when using simple store.Apr 3 2018, 1:53 PM

indygreg updated this revision to Diff 7597.Apr 3 2018, 9:55 PM

Could this be more tightly integrated with --extra-config-opt?

In D3039#49541, @durin42 wrote:

Could this be more tightly integrated with --extra-config-opt?

What do you mean by that?

In D3039#49575, @indygreg wrote:

In D3039#49541, @durin42 wrote:

Could this be more tightly integrated with --extra-config-opt?

What do you mean by that?

Broadly, I'm wondering why we're adding support for an environment variable that's duplicating the functionality of --extra-config-opt, when the latter can already be used for this, and maybe we could get the test runner to read the --extra-config-opts and expose those somehow to hghave. Does that make sense? Am I talking crazy?

In D3039#49612, @durin42 wrote:

In D3039#49575, @indygreg wrote:

In D3039#49541, @durin42 wrote:

Could this be more tightly integrated with --extra-config-opt?

What do you mean by that?

Broadly, I'm wondering why we're adding support for an environment variable that's duplicating the functionality of --extra-config-opt, when the latter can already be used for this, and maybe we could get the test runner to read the --extra-config-opts and expose those somehow to hghave. Does that make sense? Am I talking crazy?

So you are advocating for a more generic solution? This patch already exposes the list of extensions as an environment variable. So you want the list of extra options to be exposed instead?

One reason I didn't do that is complexity: I don't want to have to parse config options from bash. It was easier to just set the list of extensions.

durin42 added inline comments.Apr 4 2018, 4:16 PM

tests/run-tests.py
1075	Soooooooo I'm dumb and misread this the last couple of times. Should this be doing if section != 'extensions': continue? Other than that this is what I was proposing, and I'm not sure how I misread it so badly before. :(

indygreg updated this revision to Diff 7643.Apr 4 2018, 4:22 PM

Closed by commit rHG4e6a6d0dccee: tests: conditionalize tests based on presence of custom extensions (authored by indygreg). · Explain WhyApr 4 2018, 5:26 PM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			tests/helpers-testrepo.sh (9 lines)
M			tests/hghave.py (4 lines)
M			tests/run-tests.py (11 lines)
M			tests/test-basic.t (3 lines)
M			tests/test-debugextensions.t (6 lines)
M			tests/test-extension.t (2 lines)
M			tests/test-globalopts.t (6 lines)
M			tests/test-help.t (9 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	7565		Apr 3 2018, 1:53 PM	★	★
Diff 2	7597		Apr 3 2018, 9:55 PM	★	★
Diff 3	7643		Apr 4 2018, 4:21 PM	★	★
Diff 4	7644	rHG4e6a6d0dcceeff6c358adf2e825fcc4e3bfbd6bf	Apr 4 2018, 4:21 PM	★	★

Status	Author	Revision
Abandoned	indygreg	D3066 tests: teach test-fncache.t about the simple store
Abandoned	indygreg	D3065 repair: use repo.file().files() to rebuild fncache
Closed	indygreg	D3064 tests: disable tests for advanced clone features with simple store
Closed	indygreg	D3063 tests: skip largefiles and lfs tests when using simple store
Closed	indygreg	D3062 tests: disable infinitepush tests for simple store
Closed	indygreg	D3061 tests: conditionalize test output for simple store
Closed	indygreg	D3060 tests: disallow using simple store repo with bundlerepo
Closed	indygreg	D3059 tests: use `hg unbundle` instead of `hg pull` in some tests
Closed	indygreg	D3058 bundlerepo: use super() when calling file()
Closed	indygreg	D3057 tests: remove superfluous config setting
Closed	indygreg	D3056 tests: disable test-revlog-v2 when using simple store
Closed	indygreg	D3043 narrow: pass node into revlog.revision()
Closed	indygreg	D3042 tests: skip filelog damage tests when not using revlogs
Closed	indygreg	D3041 changegroup: remove "revlog" from error message
Closed	indygreg	D3040 tests: skip some tests when using simple store
Closed	indygreg	D3039 tests: conditionalize tests based on presence of custom extensions
Closed	indygreg	D3030 tests: conditionalize tests based on presence of revlogs for files
Closed	indygreg	D3029 tests: add test extension implementing custom filelog storage
Closed	indygreg	D3028 debugcommands: drop offset and length from debugindex by default
Closed	indygreg	D3027 debugcommands: drop base revision from debugindex
Closed	indygreg	D3026 tests: use debugdeltachain where appropriate
Closed	indygreg	D3025 tests: don't use revlog paths in tests

Diff 7644

tests/helpers-testrepo.sh

	# In most cases, the mercurial repository can be read by the bundled hg, but			# In most cases, the mercurial repository can be read by the bundled hg, but
	# that isn't always true because third-party extensions may change the store			# that isn't always true because third-party extensions may change the store
	# format, for example. In which case, the system hg installation is used.			# format, for example. In which case, the system hg installation is used.
	#			#
	# We want to use the hg version being tested when interacting with the test			# We want to use the hg version being tested when interacting with the test
	# repository, and the system hg when interacting with the mercurial source code			# repository, and the system hg when interacting with the mercurial source code
	# repository.			# repository.
	#			#
	# The mercurial source repository was typically orignally cloned with the			# The mercurial source repository was typically orignally cloned with the
	# system mercurial installation, and may require extensions or settings from			# system mercurial installation, and may require extensions or settings from
	# the system installation.			# the system installation.

				if [ -n $HGTESTEXTRAEXTENSIONS ]; then
				for extension in $HGTESTEXTRAEXTENSIONS; do
				extraoptions="$extraoptions --config extensions.$extension=!"
				done
				fi

	syshg () {			syshg () {
	(			(
	syshgenv			syshgenv
	exec hg "$@"			exec hg "$@"
	)			)
	}			}

	# Revert the environment so that running "hg" runs the system hg			# Revert the environment so that running "hg" runs the system hg
	EOF			EOF

	# Use the system hg command if the bundled hg can't read the repository with			# Use the system hg command if the bundled hg can't read the repository with
	# no warning nor error.			# no warning nor error.
	if [ -n "`hg id -R "$TESTDIR/.." 2>&1 >/dev/null`" ]; then			if [ -n "`hg id -R "$TESTDIR/.." 2>&1 >/dev/null`" ]; then
	alias testrepohg=syshg			alias testrepohg=syshg
	alias testrepohgenv=syshgenv			alias testrepohgenv=syshgenv
	else			else
	alias testrepohg=hg			alias testrepohg="hg $extraoptions"
	alias testrepohgenv=:			alias testrepohgenv=:
	fi			fi

tests/hghave.py

	def has_xdiff():			def has_xdiff():
	try:			try:
	from mercurial import policy			from mercurial import policy
	bdiff = policy.importmod('bdiff')			bdiff = policy.importmod('bdiff')
	return bdiff.xdiffblocks(b'', b'') == [(0, 0, 0, 0)]			return bdiff.xdiffblocks(b'', b'') == [(0, 0, 0, 0)]
	except (ImportError, AttributeError):			except (ImportError, AttributeError):
	return False			return False

				@check('extraextensions', 'whether tests are running with extra extensions')
				def has_extraextensions():
				return 'HGTESTEXTRAEXTENSIONS' in os.environ

	def getrepofeatures():			def getrepofeatures():
	"""Obtain set of repository features in use.			"""Obtain set of repository features in use.

	HGREPOFEATURES can be used to define or remove features. It contains			HGREPOFEATURES can be used to define or remove features. It contains
	a space-delimited list of feature strings. Strings beginning with ``-``			a space-delimited list of feature strings. Strings beginning with ``-``
	mean to remove.			mean to remove.
	"""			"""
	# Default list provided by core.			# Default list provided by core.

tests/run-tests.py

	env["HGEDITOR"] = ('"' + sys.executable + '"'			env["HGEDITOR"] = ('"' + sys.executable + '"'
	+ ' -c "import sys; sys.exit(0)"')			+ ' -c "import sys; sys.exit(0)"')
	env["HGMERGE"] = "internal:merge"			env["HGMERGE"] = "internal:merge"
	env["HGUSER"] = "test"			env["HGUSER"] = "test"
	env["HGENCODING"] = "ascii"			env["HGENCODING"] = "ascii"
	env["HGENCODINGMODE"] = "strict"			env["HGENCODINGMODE"] = "strict"
	env['HGIPV6'] = str(int(self._useipv6))			env['HGIPV6'] = str(int(self._useipv6))

				extraextensions = []
				for opt in self._extraconfigopts:
				section, key = opt.encode('utf-8').split(b'.', 1)
				durin42Unsubmitted Not Done Soooooooo I'm dumb and misread this the last couple of times. Should this be doing if section != 'extensions': continue? Other than that this is what I was proposing, and I'm not sure how I misread it so badly before. :( durin42: Soooooooo I'm dumb and misread this the last couple of times. Should this be doing if section !
				if section != 'extensions':
				continue
				name = key.split(b'=', 1)[0]
				extraextensions.append(name)

				if extraextensions:
				env['HGTESTEXTRAEXTENSIONS'] = b' '.join(extraextensions)

	# LOCALIP could be ::1 or 127.0.0.1. Useful for tests that require raw			# LOCALIP could be ::1 or 127.0.0.1. Useful for tests that require raw
	# IP addresses.			# IP addresses.
	env['LOCALIP'] = self._localip()			env['LOCALIP'] = self._localip()

	# Reset some environment variables to well-known values so that			# Reset some environment variables to well-known values so that
	# the tests produce repeatable output.			# the tests produce repeatable output.
	env['LANG'] = env['LC_ALL'] = env['LANGUAGE'] = 'C'			env['LANG'] = env['LC_ALL'] = env['LANGUAGE'] = 'C'
	env['TZ'] = 'GMT'			env['TZ'] = 'GMT'

tests/test-basic.t

	Create a repository:			Create a repository:

				#if no-extraextensions
	$ hg config			$ hg config
	devel.all-warnings=true			devel.all-warnings=true
	devel.default-date=0 0			devel.default-date=0 0
	extensions.fsmonitor= (fsmonitor !)			extensions.fsmonitor= (fsmonitor !)
	largefiles.usercache=$TESTTMP/.cache/largefiles			largefiles.usercache=$TESTTMP/.cache/largefiles
	lfs.usercache=$TESTTMP/.cache/lfs			lfs.usercache=$TESTTMP/.cache/lfs
	ui.slash=True			ui.slash=True
	ui.interactive=False			ui.interactive=False
	ui.mergemarkers=detailed			ui.mergemarkers=detailed
	ui.promptecho=True			ui.promptecho=True
	web.address=localhost			web.address=localhost
	web\.ipv6=(?:True\|False) (re)			web\.ipv6=(?:True\|False) (re)
	web.server-header=testing stub value			web.server-header=testing stub value
				#endif

	$ hg init t			$ hg init t
	$ cd t			$ cd t

	Prepare a changeset:			Prepare a changeset:

	$ echo a > a			$ echo a > a
	$ hg add a			$ hg add a

tests/test-debugextensions.t

				#if no-extraextensions
	$ hg debugextensions			$ hg debugextensions
				#endif

	$ debugpath=`pwd`/extwithoutinfos.py			$ debugpath=`pwd`/extwithoutinfos.py

	$ cat > extwithoutinfos.py <<EOF			$ cat > extwithoutinfos.py <<EOF
	> EOF			> EOF
	$ cat > extwithinfos.py <<EOF			$ cat > extwithinfos.py <<EOF
	> testedwith = b'3.0 3.1 3.2.1'			> testedwith = b'3.0 3.1 3.2.1'
	> buglink = b'https://example.org/bts'			> buglink = b'https://example.org/bts'
	> EOF			> EOF

	$ cat >> $HGRCPATH <<EOF			$ cat >> $HGRCPATH <<EOF
	> [extensions]			> [extensions]
	> histedit=			> histedit=
	> patchbomb=			> patchbomb=
	> rebase=			> rebase=
	> mq=			> mq=
	> ext1 = $debugpath			> ext1 = $debugpath
	> ext2 = `pwd`/extwithinfos.py			> ext2 = `pwd`/extwithinfos.py
	> EOF			> EOF

				$ for extension in $HGTESTEXTRAEXTENSIONS; do
				> echo "$extension=!" >> $HGRCPATH
				> done

	$ hg debugextensions			$ hg debugextensions
	ext1 (untested!)			ext1 (untested!)
	ext2 (3.2.1!)			ext2 (3.2.1!)
	histedit			histedit
	mq			mq
	patchbomb			patchbomb
	rebase			rebase

tests/test-extension.t

	> strip =			> strip =
	> hgext.mq =			> hgext.mq =
	> hgext/mq =			> hgext/mq =
	> EOF			> EOF

	Show extensions:			Show extensions:
	(note that mq force load strip, also checking it's not loaded twice)			(note that mq force load strip, also checking it's not loaded twice)

				#if no-extraextensions
	$ hg debugextensions			$ hg debugextensions
	mq			mq
	strip			strip
				#endif

	For extensions, which name matches one of its commands, help			For extensions, which name matches one of its commands, help
	message should ask '-v -e' to get list of built-in aliases			message should ask '-v -e' to get list of built-in aliases
	along with extension help itself			along with extension help itself

	$ mkdir $TESTTMP/d			$ mkdir $TESTTMP/d
	$ cat > $TESTTMP/d/dodo.py <<EOF			$ cat > $TESTTMP/d/dodo.py <<EOF
	> """			> """

tests/test-globalopts.t

	$ hg --version -q			$ hg --version -q
	Mercurial Distributed SCM * (glob)			Mercurial Distributed SCM * (glob)

	hide outer repo			hide outer repo
	$ hg init			$ hg init

	Testing -h/--help:			Testing -h/--help:

				#if no-extraextensions

	$ hg -h			$ hg -h
	Mercurial Distributed SCM			Mercurial Distributed SCM

	list of commands:			list of commands:

	add add the specified files on the next commit			add add the specified files on the next commit
	addremove add all new files, delete all missing files			addremove add all new files, delete all missing files
	annotate show changeset information by line for each file			annotate show changeset information by line for each file
	revisions Specifying Revisions			revisions Specifying Revisions
	scripting Using Mercurial from scripts and automation			scripting Using Mercurial from scripts and automation
	subrepos Subrepositories			subrepos Subrepositories
	templating Template Usage			templating Template Usage
	urls URL Paths			urls URL Paths

	(use 'hg help -v' to show built-in aliases and global options)			(use 'hg help -v' to show built-in aliases and global options)



	$ hg --help			$ hg --help
	Mercurial Distributed SCM			Mercurial Distributed SCM

	list of commands:			list of commands:

	add add the specified files on the next commit			add add the specified files on the next commit
	addremove add all new files, delete all missing files			addremove add all new files, delete all missing files
	annotate show changeset information by line for each file			annotate show changeset information by line for each file
	revisions Specifying Revisions			revisions Specifying Revisions
	scripting Using Mercurial from scripts and automation			scripting Using Mercurial from scripts and automation
	subrepos Subrepositories			subrepos Subrepositories
	templating Template Usage			templating Template Usage
	urls URL Paths			urls URL Paths

	(use 'hg help -v' to show built-in aliases and global options)			(use 'hg help -v' to show built-in aliases and global options)

				#endif

	Not tested: --debugger			Not tested: --debugger

tests/test-help.t

	pull pull changes from the specified source			pull pull changes from the specified source
	push push changes to the specified destination			push push changes to the specified destination
	remove remove the specified files on the next commit			remove remove the specified files on the next commit
	serve start stand-alone webserver			serve start stand-alone webserver
	status show changed files in the working directory			status show changed files in the working directory
	summary summarize working directory state			summary summarize working directory state
	update update working directory (or switch revisions)			update update working directory (or switch revisions)

				Extra extensions will be printed in help output in a non-reliable order since
				the extension is unknown.
				#if no-extraextensions

	$ hg help			$ hg help
	Mercurial Distributed SCM			Mercurial Distributed SCM

	list of commands:			list of commands:

	add add the specified files on the next commit			add add the specified files on the next commit
	addremove add all new files, delete all missing files			addremove add all new files, delete all missing files
	annotate show changeset information by line for each file			annotate show changeset information by line for each file
	schemes extend schemes with shortcuts to repository swarms			schemes extend schemes with shortcuts to repository swarms
	share share a common history between several working directories			share share a common history between several working directories
	shelve save and restore changes to the working directory			shelve save and restore changes to the working directory
	strip strip changesets and their descendants from history			strip strip changesets and their descendants from history
	transplant command to transplant changesets from another branch			transplant command to transplant changesets from another branch
	win32mbcs allow the use of MBCS paths with problematic encodings			win32mbcs allow the use of MBCS paths with problematic encodings
	zeroconf discover and advertise repositories on the local network			zeroconf discover and advertise repositories on the local network

				#endif

	Verify that deprecated extensions are included if --verbose:			Verify that deprecated extensions are included if --verbose:

	$ hg -v help extensions \| grep children			$ hg -v help extensions \| grep children
	children command to display child changesets (DEPRECATED)			children command to display child changesets (DEPRECATED)

	Verify that extension keywords appear in help templates			Verify that extension keywords appear in help templates

	$ hg help --config extensions.transplant= templating\|grep transplant > /dev/null			$ hg help --config extensions.transplant= templating\|grep transplant > /dev/null
	nohelp hg nohelp			nohelp hg nohelp

	Extension Commands:			Extension Commands:

	nohelp (no help text available)			nohelp (no help text available)

	Test that default list of commands omits extension commands			Test that default list of commands omits extension commands

				#if no-extraextensions

	$ hg help			$ hg help
	Mercurial Distributed SCM			Mercurial Distributed SCM

	list of commands:			list of commands:

	add add the specified files on the next commit			add add the specified files on the next commit
	addremove add all new files, delete all missing files			addremove add all new files, delete all missing files
	annotate show changeset information by line for each file			annotate show changeset information by line for each file
	revisions Specifying Revisions			revisions Specifying Revisions
	scripting Using Mercurial from scripts and automation			scripting Using Mercurial from scripts and automation
	subrepos Subrepositories			subrepos Subrepositories
	templating Template Usage			templating Template Usage
	urls URL Paths			urls URL Paths

	(use 'hg help -v' to show built-in aliases and global options)			(use 'hg help -v' to show built-in aliases and global options)

				#endif

	Test list of internal help commands			Test list of internal help commands

	$ hg help debug			$ hg help debug
	debug commands (internal and unsupported):			debug commands (internal and unsupported):

	debugancestor			debugancestor
	find the ancestor revision of two revisions in a given index			find the ancestor revision of two revisions in a given index