This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3251

tests: glob away fqdn wherever we print it
ClosedPublic

Authored by durin42 on Apr 11 2018, 5:12 PM.

Download Raw Diff

Details

Reviewers

indygreg

Group Reviewers

hg-reviewers

Commits

rHGfb91757471b5: tests: glob away fqdn wherever we print it

Summary

These localhost instances are actually from a getfqdn call, which
means on some of my test systems it comes out as localhost.localdomain
or
1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa. I'm
tired of this, so let's glob it away.

Diff Detail

Repository

rHG Mercurial

Lint

Lint Skipped

Unit

Unit Tests Skipped

Event Timeline

durin42 created this revision.Apr 11 2018, 5:12 PM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptApr 11 2018, 5:12 PM

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

durin42 added a child revision: D3253: py3: whitelist another nine passing tests.Apr 11 2018, 5:43 PM

Is this something where a substitution pattern would work (so that it is automatic)? I looked at subbing in $LOCALIP$ instead of having to glob $LOCALIP lines manually, but I didn't because all I could tell was that the glob helped FreeBSD jails in some way that I probably wouldn't be able to test. These seem somewhat related, maybe. (And I just started hitting this too on CentOS 7.4 for some reason, so +1.)

In D3251#52130, @mharbison72 wrote:

Is this something where a substitution pattern would work (so that it is automatic)? I looked at subbing in $LOCALIP$ instead of having to glob $LOCALIP lines manually, but I didn't because all I could tell was that the glob helped FreeBSD jails in some way that I probably wouldn't be able to test. These seem somewhat related, maybe. (And I just started hitting this too on CentOS 7.4 for some reason, so +1.)

I think this only shows up in --debug server output, which we didn't have until recently.

I tried *super hard* to get this to work using a replacement mechanism, and failed. This was my "the heck with it, I want to be done" solution.

In D3251#52132, @durin42 wrote:

In D3251#52130, @mharbison72 wrote:

Is this something where a substitution pattern would work (so that it is automatic)? I looked at subbing in $LOCALIP$ instead of having to glob $LOCALIP lines manually, but I didn't because all I could tell was that the glob helped FreeBSD jails in some way that I probably wouldn't be able to test. These seem somewhat related, maybe. (And I just started hitting this too on CentOS 7.4 for some reason, so +1.)

I think this only shows up in --debug server output, which we didn't have until recently.
I tried *super hard* to get this to work using a replacement mechanism, and failed. This was my "the heck with it, I want to be done" solution.

Seems reasonable, there aren't too many here. I'm more interested in switching $LOCALIP, because I keep hitting that.

I think $LOCALIP$ is the proper place for this fix. But it sounds like there were issues implementing that. Perfect is the enemy of done.

This revision is now accepted and ready to land.Apr 12 2018, 11:26 AM

Closed by commit rHGfb91757471b5: tests: glob away fqdn wherever we print it (authored by durin42). · Explain WhyApr 12 2018, 11:34 AM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			tests/test-pull-bundle.t (6 lines)
M			tests/test-push-http.t (4 lines)

Status	Author	Revision
Closed	durin42	D3253 py3: whitelist another nine passing tests
Closed	durin42	D3251 tests: glob away fqdn wherever we print it
Closed	durin42	D3250 hgweb: use native strings when interfacing with stdlib headers
Closed	durin42	D3249 wireprotoserver: headers are bytes for us internally, use bytes
Closed	durin42	D3248 hgweb: put response headers back into str for Python 3
Closed	durin42	D3247 tests: load showstack in test-pull-http.t so network hangs are easier to find
Closed	durin42	D3246 keepalive: rewrite readinto() to not use read()
Closed	durin42	D2854 hgweb: use our forked wsgiheaders module instead of stdlib one
Closed	durin42	D2853 tests: add a cat of `error.log` in subrepo test
Closed	durin42	D2846 hghave: fix hardlink-whitelisted check on Python 3
Closed	durin42	D2845 hghave: fix xdiff check on Python 3
Closed	durin42	D2844 commandserver: prefer first-party selectors module from Python 3 to backport
Closed	durin42	D3245 wsgiheaders: import a bytes-ified fork of wsgiref.headers from cpython@46f5072

Diff 8017

tests/test-pull-bundle.t

	$ hg bundle --base 1 -r 2 .hg/2.hg			$ hg bundle --base 1 -r 2 .hg/2.hg
	1 changesets found			1 changesets found
	$ cat <<EOF > .hg/pullbundles.manifest			$ cat <<EOF > .hg/pullbundles.manifest
	> 2.hg heads=effea6de0384e684f44435651cb7bd70b8735bd4 bases=bbd179dfa0a71671c253b3ae0aa1513b60d199fa			> 2.hg heads=effea6de0384e684f44435651cb7bd70b8735bd4 bases=bbd179dfa0a71671c253b3ae0aa1513b60d199fa
	> 1.hg heads=ed1b79f46b9a29f5a6efa59cf12fcfca43bead5a bases=bbd179dfa0a71671c253b3ae0aa1513b60d199fa			> 1.hg heads=ed1b79f46b9a29f5a6efa59cf12fcfca43bead5a bases=bbd179dfa0a71671c253b3ae0aa1513b60d199fa
	> 0.hg heads=bbd179dfa0a71671c253b3ae0aa1513b60d199fa			> 0.hg heads=bbd179dfa0a71671c253b3ae0aa1513b60d199fa
	> EOF			> EOF
	$ hg --config blackbox.track=debug --debug serve -p $HGPORT2 -d --pid-file=../repo.pid			$ hg --config blackbox.track=debug --debug serve -p $HGPORT2 -d --pid-file=../repo.pid
	listening at http://localhost:$HGPORT2/ (bound to $LOCALIP:$HGPORT2) (?)			listening at http://*:$HGPORT2/ (bound to $LOCALIP:$HGPORT2) (glob) (?)
	$ cat ../repo.pid >> $DAEMON_PIDS			$ cat ../repo.pid >> $DAEMON_PIDS
	$ cd ..			$ cd ..
	$ hg clone -r 0 http://localhost:$HGPORT2/ repo.pullbundle			$ hg clone -r 0 http://localhost:$HGPORT2/ repo.pullbundle
	adding changesets			adding changesets
	adding manifests			adding manifests
	adding file changes			adding file changes
	added 1 changesets with 1 changes to 1 files			added 1 changesets with 1 changes to 1 files
	new changesets bbd179dfa0a7			new changesets bbd179dfa0a7
	* sending pullbundle "1.hg" (glob)			* sending pullbundle "1.hg" (glob)
	* sending pullbundle "2.hg" (glob)			* sending pullbundle "2.hg" (glob)
	$ rm repo/.hg/blackbox.log			$ rm repo/.hg/blackbox.log

	Test pullbundle functionality for incremental pulls			Test pullbundle functionality for incremental pulls

	$ cd repo			$ cd repo
	$ hg --config blackbox.track=debug --debug serve -p $HGPORT2 -d --pid-file=../repo.pid			$ hg --config blackbox.track=debug --debug serve -p $HGPORT2 -d --pid-file=../repo.pid
	listening at http://localhost:$HGPORT2/ (bound to $LOCALIP:$HGPORT2) (?)			listening at http://*:$HGPORT2/ (bound to $LOCALIP:$HGPORT2) (glob) (?)
	$ cat ../repo.pid >> $DAEMON_PIDS			$ cat ../repo.pid >> $DAEMON_PIDS
	$ cd ..			$ cd ..
	$ hg clone http://localhost:$HGPORT2/ repo.pullbundle2			$ hg clone http://localhost:$HGPORT2/ repo.pullbundle2
	requesting all changes			requesting all changes
	adding changesets			adding changesets
	adding manifests			adding manifests
	adding file changes			adding file changes
	added 1 changesets with 1 changes to 1 files			added 1 changesets with 1 changes to 1 files
	Test recovery from misconfigured server sending no new data			Test recovery from misconfigured server sending no new data

	$ cd repo			$ cd repo
	$ cat <<EOF > .hg/pullbundles.manifest			$ cat <<EOF > .hg/pullbundles.manifest
	> 0.hg heads=ed1b79f46b9a29f5a6efa59cf12fcfca43bead5a bases=bbd179dfa0a71671c253b3ae0aa1513b60d199fa			> 0.hg heads=ed1b79f46b9a29f5a6efa59cf12fcfca43bead5a bases=bbd179dfa0a71671c253b3ae0aa1513b60d199fa
	> 0.hg heads=bbd179dfa0a71671c253b3ae0aa1513b60d199fa			> 0.hg heads=bbd179dfa0a71671c253b3ae0aa1513b60d199fa
	> EOF			> EOF
	$ hg --config blackbox.track=debug --debug serve -p $HGPORT2 -d --pid-file=../repo.pid			$ hg --config blackbox.track=debug --debug serve -p $HGPORT2 -d --pid-file=../repo.pid
	listening at http://localhost:$HGPORT2/ (bound to $LOCALIP:$HGPORT2) (?)			listening at http://*:$HGPORT2/ (bound to $LOCALIP:$HGPORT2) (glob) (?)
	$ cat ../repo.pid >> $DAEMON_PIDS			$ cat ../repo.pid >> $DAEMON_PIDS
	$ cd ..			$ cd ..
	$ hg clone -r 0 http://localhost:$HGPORT2/ repo.pullbundle3			$ hg clone -r 0 http://localhost:$HGPORT2/ repo.pullbundle3
	adding changesets			adding changesets
	adding manifests			adding manifests
	adding file changes			adding file changes
	added 1 changesets with 1 changes to 1 files			added 1 changesets with 1 changes to 1 files
	new changesets bbd179dfa0a7			new changesets bbd179dfa0a7

tests/test-push-http.t

	$ cat >> .hg/hgrc <<EOF			$ cat >> .hg/hgrc <<EOF
	> allow_push = *			> allow_push = *
	> [hooks]			> [hooks]
	> changegroup = sh -c "printenv.py changegroup 0"			> changegroup = sh -c "printenv.py changegroup 0"
	> pushkey = sh -c "printenv.py pushkey 0"			> pushkey = sh -c "printenv.py pushkey 0"
	> txnclose-phase.test = sh $TESTTMP/hook.sh			> txnclose-phase.test = sh $TESTTMP/hook.sh
	> EOF			> EOF
	$ req "--debug --config extensions.blackbox="			$ req "--debug --config extensions.blackbox="
	listening at http://localhost:$HGPORT/ (bound to $LOCALIP:$HGPORT) (?)			listening at http://*:$HGPORT/ (bound to $LOCALIP:$HGPORT) (glob) (?)
	pushing to http://localhost:$HGPORT/			pushing to http://localhost:$HGPORT/
	searching for changes			searching for changes
	remote: redirecting incoming bundle to /hg-unbundle- (glob)			remote: redirecting incoming bundle to /hg-unbundle- (glob)
	remote: adding changesets			remote: adding changesets
	remote: add changeset ba677d0156c1			remote: add changeset ba677d0156c1
	remote: adding manifests			remote: adding manifests
	remote: adding file changes			remote: adding file changes
	remote: adding a revisions			remote: adding a revisions
	remote: added 1 changesets with 1 changes to 1 files			remote: added 1 changesets with 1 changes to 1 files
	remote: updating the branch cache			remote: updating the branch cache
	remote: running hook txnclose-phase.test: sh $TESTTMP/hook.sh			remote: running hook txnclose-phase.test: sh $TESTTMP/hook.sh
	remote: phase-move: cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b: draft -> public			remote: phase-move: cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b: draft -> public
	remote: running hook txnclose-phase.test: sh $TESTTMP/hook.sh			remote: running hook txnclose-phase.test: sh $TESTTMP/hook.sh
	remote: phase-move: ba677d0156c1196c1a699fa53f390dcfc3ce3872: -> public			remote: phase-move: ba677d0156c1196c1a699fa53f390dcfc3ce3872: -> public
	remote: running hook changegroup: sh -c "printenv.py changegroup 0"			remote: running hook changegroup: sh -c "printenv.py changegroup 0"
	remote: changegroup hook: HG_HOOKNAME=changegroup HG_HOOKTYPE=changegroup HG_NODE=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_NODE_LAST=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_SOURCE=serve HG_TXNID=TXN:$ID$ HG_URL=remote:http:$LOCALIP: (glob)			remote: changegroup hook: HG_HOOKNAME=changegroup HG_HOOKTYPE=changegroup HG_NODE=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_NODE_LAST=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_SOURCE=serve HG_TXNID=TXN:$ID$ HG_URL=remote:http:$LOCALIP: (glob)
	% serve errors			% serve errors
	$ hg rollback			$ hg rollback
	repository tip rolled back to revision 0 (undo serve)			repository tip rolled back to revision 0 (undo serve)
	$ req "--debug --config server.streamunbundle=True --config extensions.blackbox="			$ req "--debug --config server.streamunbundle=True --config extensions.blackbox="
	listening at http://localhost:$HGPORT/ (bound to $LOCALIP:$HGPORT) (?)			listening at http://*:$HGPORT/ (bound to $LOCALIP:$HGPORT) (glob) (?)
	pushing to http://localhost:$HGPORT/			pushing to http://localhost:$HGPORT/
	searching for changes			searching for changes
	remote: adding changesets			remote: adding changesets
	remote: add changeset ba677d0156c1			remote: add changeset ba677d0156c1
	remote: adding manifests			remote: adding manifests
	remote: adding file changes			remote: adding file changes
	remote: adding a revisions			remote: adding a revisions
	remote: added 1 changesets with 1 changes to 1 files			remote: added 1 changesets with 1 changes to 1 files

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	8017		Apr 11 2018, 5:12 PM	★	★
Diff 2	8070	rHGfb91757471b54502218d9d38991b9467dba08825	Apr 11 2018, 5:07 PM	★	★