This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3098

tests: don't drop global hgrc
ClosedPublic

Authored by indygreg on Apr 4 2018, 9:24 PM.

Download Raw Diff

Details

Reviewers

durin42

Group Reviewers

hg-reviewers

Commits

rHGafd7b0afe4a6: tests: don't drop global hgrc

Summary

Various tests are failing when the simple store extension is loaded
because the test overrides HGRCPATH and preempts loading of extensions
that were injected via --extra-config-opt.

In most cases, it is acceptable to always load the global HGRCPATH.
So this commit changes a couple of tests so the global HGRCPATH
is still pulled in.

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 4 2018, 9:24 PM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptApr 4 2018, 9:24 PM

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

indygreg added a child revision: D3099: tests: disable test-static-http.t with simple store.Apr 4 2018, 9:24 PM

durin42 accepted this revision.Apr 6 2018, 8:31 PM

This revision is now accepted and ready to land.Apr 6 2018, 8:31 PM

Closed by commit rHGafd7b0afe4a6: tests: don't drop global hgrc (authored by indygreg). · Explain WhyApr 6 2018, 9:20 PM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			tests/test-command-template.t (3 lines)
M			tests/test-wireproto.t (5 lines)

Status	Author	Revision
Closed	indygreg	D3154 filelog: wrap revlog instead of inheriting it (API)
Closed	indygreg	D3153 tests: call rawsize() directly
Closed	indygreg	D3152 upgrade: sniff for filelog type
Closed	indygreg	D3151 revlog: move censor logic into main revlog class
Closed	indygreg	D3150 revlog: move parsemeta() and packmeta() from filelog (API)
Closed	indygreg	D3149 filelog: declare that filelog implements a storage interface
Closed	indygreg	D3148 repository: define existing interface for file storage
Closed	indygreg	D3147 tests: run some largefiles and lfs tests with simple store
Closed	indygreg	D3119 commands: don't violate storage abstractions in `manifest --all`
Closed	indygreg	D3118 commands: document the layering violation in `manifest --all`
Abandoned	indygreg	D3117 tests: make test-convert-git.t more deterministic
Closed	indygreg	D3116 simplestore: correctly implement flag processors
Closed	indygreg	D3115 tests: `hg init` after resetting HGRCPATH
Closed	indygreg	D3114 tests: work around potential repo incompatibility
Closed	indygreg	D3113 tests: disable test-keyword.t with simple store
Closed	indygreg	D3112 tests: conditionalize test-treemanifest.t
Closed	indygreg	D3111 tests: use unbundle in test-symlink-os-yes-fs-no.py
Closed	indygreg	D3110 tests: disable `hg clone --stream` test with simple store
Closed	indygreg	D3109 tests: use `hg unbundle` in test-setdiscovery.t
Closed	indygreg	D3108 tests: require revlog store for test-verify.t
Closed	indygreg	D3107 tests: conditionalize test-commandserver.t based on extra extensions
Closed	indygreg	D3106 tests: conditionalize test-bundle.t
Closed	indygreg	D3105 tests: require revlog store with test-repair-strip.t
Closed	indygreg	D3104 simplestore: back up index when adding a revision
Closed	indygreg	D3103 tests: disable shallow narrow tests with simple store
Closed	indygreg	D3102 tests: skip test-hgweb-bundle.t if we don't support bundlerepos
Closed	indygreg	D3101 tests: disable test-audit-path.t with simple store
Closed	indygreg	D3100 tests: port test-convert-filemap.t to simple store
Closed	indygreg	D3099 tests: disable test-static-http.t with simple store
Closed	indygreg	D3098 tests: don't drop global hgrc
Closed	indygreg	D3097 verify: allow suppressing warnings about extra files
Closed	indygreg	D3096 tests: conditionalize tests for various repo features
Closed	indygreg	D3095 simplestore: use a custom store for the simple store repo
Closed	indygreg	D3094 verify: drop "revlog" from warning message
Closed	indygreg	D3093 store: make file filtering during walk configurable
Closed	indygreg	D3092 simplestore: shore up lookup errors
Closed	indygreg	D3091 tests: extract dumprevlog tests to own file
Closed	indygreg	D3090 tests: skip test-censor.t when using simple store

Diff 7824

tests/test-command-template.t

	> [templatealias]			> [templatealias]
	> a = rev			> a = rev
	> EOF			> EOF
	$ hg log -l1 -T./map-simple			$ hg log -l1 -T./map-simple
	8			8

	so it can be included in hgrc			so it can be included in hgrc

	$ cat <<'EOF' > myhgrc			$ cat <<EOF > myhgrc
				> %include $HGRCPATH
	> %include map-simple			> %include map-simple
	> [templates]			> [templates]
	> foo = "{changeset}"			> foo = "{changeset}"
	> EOF			> EOF
	$ HGRCPATH=./myhgrc hg log -l1 -Tfoo			$ HGRCPATH=./myhgrc hg log -l1 -Tfoo
	8			8
	$ HGRCPATH=./myhgrc hg log -l1 -T'{a}\n'			$ HGRCPATH=./myhgrc hg log -l1 -T'{a}\n'
	8			8

tests/test-wireproto.t

	$LOCALIP - - [$LOGDATE$] "GET /?cmd=debugwireargs HTTP/1.1" 200 - x-hgarg-1:one=eins&two=zwei x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ (glob)			$LOCALIP - - [$LOGDATE$] "GET /?cmd=debugwireargs HTTP/1.1" 200 - x-hgarg-1:one=eins&two=zwei x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ (glob)
	$LOCALIP - - [$LOGDATE$] "GET /?cmd=debugwireargs HTTP/1.1" 200 - x-hgarg-1:one=eins&two=zwei x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ (glob)			$LOCALIP - - [$LOGDATE$] "GET /?cmd=debugwireargs HTTP/1.1" 200 - x-hgarg-1:one=eins&two=zwei x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ (glob)
	* - - [*] "GET /?cmd=capabilities HTTP/1.1" 200 - (glob)			* - - [*] "GET /?cmd=capabilities HTTP/1.1" 200 - (glob)
	$LOCALIP - - [$LOGDATE$] "GET /?cmd=debugwireargs HTTP/1.1" 200 - x-hgarg-1:four=onethousandcharactersxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx&one x-hgarg-2:=un&three=trois&two=deux x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ (glob)			$LOCALIP - - [$LOGDATE$] "GET /?cmd=debugwireargs HTTP/1.1" 200 - x-hgarg-1:four=onethousandcharactersxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx&one x-hgarg-2:=un&three=trois&two=deux x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ (glob)
	$LOCALIP - - [$LOGDATE$] "GET /?cmd=debugwireargs HTTP/1.1" 200 - x-hgarg-1:four=onethousandcharactersxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx&one x-hgarg-2:=un&three=trois&two=deux x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ (glob)			$LOCALIP - - [$LOGDATE$] "GET /?cmd=debugwireargs HTTP/1.1" 200 - x-hgarg-1:four=onethousandcharactersxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx&one x-hgarg-2:=un&three=trois&two=deux x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ (glob)

	HTTP without the httpheader capability:			HTTP without the httpheader capability:

	$ HGRCPATH="`pwd`/repo/.hgrc"			$ CAP=httpheader . "$TESTDIR/notcapable"
	$ export HGRCPATH
	$ CAP=httpheader
	$ . "$TESTDIR/notcapable"

	$ hg serve -R repo -p $HGPORT2 -d --pid-file=hg2.pid -E error2.log -A access2.log			$ hg serve -R repo -p $HGPORT2 -d --pid-file=hg2.pid -E error2.log -A access2.log
	$ cat hg2.pid >> $DAEMON_PIDS			$ cat hg2.pid >> $DAEMON_PIDS

	$ hg debugwireargs http://localhost:$HGPORT2/ un deux trois quatre			$ hg debugwireargs http://localhost:$HGPORT2/ un deux trois quatre
	un deux trois quatre None			un deux trois quatre None
	$ hg debugwireargs http://localhost:$HGPORT2/ eins zwei --four vier			$ hg debugwireargs http://localhost:$HGPORT2/ eins zwei --four vier
	eins zwei None vier None			eins zwei None vier None

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	7680		Apr 4 2018, 9:24 PM	★	★
Diff 2	7824	rHGafd7b0afe4a6db12ab5dfd45826de1ce74153be4	Apr 4 2018, 5:25 PM	★	★