This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3442

tests: remove #require killdaemons
ClosedPublic

Authored by indygreg on May 5 2018, 10:03 PM.

Download Raw Diff

Details

Reviewers

None

Group Reviewers

hg-reviewers

Commits

rHGb4b7427b5786: tests: remove #require killdaemons

Summary

The killdaemons hghave feature has returned True since it was
introduced in 448d0c452140. As such, "#require killdaemons" has
no effect and is superfluous. So we remove instances of it.

Diff Detail

Repository

rHG Mercurial

Lint

Lint Skipped

Unit

Unit Tests Skipped

Event Timeline

indygreg created this revision.May 5 2018, 10:03 PM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptMay 5 2018, 10:03 PM

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

indygreg added a child revision: D3443: tests: remove pid file by default.May 5 2018, 10:03 PM

Perhaps it was useful at some point to annotate these tests so they didn't get run if you had an old test runner and hghave? I suppose it's rare to run with a test runner that doesn't match the test cases when you're running core tests, so maybe this isn't the reason.

Closed by commit rHGb4b7427b5786: tests: remove #require killdaemons (authored by indygreg). · Explain WhyMay 6 2018, 8:20 AM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			tests/test-bad-pull.t (2 lines)
M			tests/test-bundle2-remote-changegroup.t (2 lines)
M			tests/test-http-bad-server.t (2 lines)
M			tests/test-http-branchmap.t (2 lines)
M			tests/test-http-permissions.t (2 lines)
M			tests/test-http.t (2 lines)
M			tests/test-known.t (2 lines)
M			tests/test-mq-qclone-http.t (2 lines)
M			tests/test-mq-qimport.t (2 lines)
M			tests/test-phases-exchange.t (2 lines)
M			tests/test-pull-http.t (2 lines)
M			tests/test-push-http.t (2 lines)
M			tests/test-share.t (2 lines)
M			tests/test-static-http.t (2 lines)
M			tests/test-subrepo-relative-path.t (2 lines)
M			tests/test-transplant.t (2 lines)
M			tests/test-treediscovery-legacy.t (2 lines)
M			tests/test-treediscovery.t (2 lines)
M			tests/test-treemanifest.t (2 lines)
M			tests/test-unbundlehash.t (2 lines)
M			tests/test-wireproto.t (2 lines)

Commit	Parents	Author	Summary	Date
		Gregory Szorc		Apr 30 2018, 10:54 PM

	Status	Author	Revision
	Closed	indygreg	D3443 tests: remove pid file by default
	Closed	indygreg	D3442 tests: remove #require killdaemons

Diff 8457

tests/test-bad-pull.t

	#require serve killdaemons			#require serve

	$ hg clone http://localhost:$HGPORT/ copy			$ hg clone http://localhost:$HGPORT/ copy
	abort: * (glob)			abort: * (glob)
	[255]			[255]

	$ test -d copy			$ test -d copy
	[1]			[1]

	$ $PYTHON "$TESTDIR/dumbhttp.py" -p $HGPORT --pid dumb.pid			$ $PYTHON "$TESTDIR/dumbhttp.py" -p $HGPORT --pid dumb.pid
	$ cat dumb.pid >> $DAEMON_PIDS			$ cat dumb.pid >> $DAEMON_PIDS
	$ hg clone http://localhost:$HGPORT/foo copy2			$ hg clone http://localhost:$HGPORT/foo copy2
	abort: HTTP Error 404: * (glob)			abort: HTTP Error 404: * (glob)
	[255]			[255]
	$ killdaemons.py			$ killdaemons.py

tests/test-bundle2-remote-changegroup.t

	#require killdaemons

	#testcases sshv1 sshv2			#testcases sshv1 sshv2

	#if sshv2			#if sshv2
	$ cat >> $HGRCPATH << EOF			$ cat >> $HGRCPATH << EOF
	> [experimental]			> [experimental]
	> sshpeer.advertise-v2 = true			> sshpeer.advertise-v2 = true
	> sshserver.support-v2 = true			> sshserver.support-v2 = true
	> EOF			> EOF

tests/test-http-bad-server.t

	#require killdaemons serve zstd			#require serve zstd

	Client version is embedded in HTTP request and is effectively dynamic. Pin the			Client version is embedded in HTTP request and is effectively dynamic. Pin the
	version so behavior is deterministic.			version so behavior is deterministic.

	$ cat > fakeversion.py << EOF			$ cat > fakeversion.py << EOF
	> from mercurial import util			> from mercurial import util
	> util.version = lambda: '4.2'			> util.version = lambda: '4.2'
	> EOF			> EOF

tests/test-http-branchmap.t

	#require killdaemons

	$ hgserve() {			$ hgserve() {
	> hg serve -a localhost -p $HGPORT1 -d --pid-file=hg.pid \			> hg serve -a localhost -p $HGPORT1 -d --pid-file=hg.pid \
	> -E errors.log -v $@ > startup.log			> -E errors.log -v $@ > startup.log
	> # Grepping hg serve stdout would hang on Windows			> # Grepping hg serve stdout would hang on Windows
	> grep -v 'listening at' startup.log			> grep -v 'listening at' startup.log
	> cat hg.pid >> "$DAEMON_PIDS"			> cat hg.pid >> "$DAEMON_PIDS"
	> }			> }
	$ hg init a			$ hg init a

tests/test-http-permissions.t

	#require killdaemons

	$ cat > fakeremoteuser.py << EOF			$ cat > fakeremoteuser.py << EOF
	> import os			> import os
	> from mercurial.hgweb import hgweb_mod			> from mercurial.hgweb import hgweb_mod
	> from mercurial import wireprotov1server			> from mercurial import wireprotov1server
	> class testenvhgweb(hgweb_mod.hgweb):			> class testenvhgweb(hgweb_mod.hgweb):
	> def __call__(self, env, respond):			> def __call__(self, env, respond):
	> # Allow REMOTE_USER to define authenticated user.			> # Allow REMOTE_USER to define authenticated user.
	> if r'REMOTE_USER' in os.environ:			> if r'REMOTE_USER' in os.environ:

tests/test-http.t

	#require killdaemons serve			#require serve

	$ hg init test			$ hg init test
	$ cd test			$ cd test
	$ echo foo>foo			$ echo foo>foo
	$ mkdir foo.d foo.d/bAr.hg.d foo.d/baR.d.hg			$ mkdir foo.d foo.d/bAr.hg.d foo.d/baR.d.hg
	$ echo foo>foo.d/foo			$ echo foo>foo.d/foo
	$ echo bar>foo.d/bAr.hg.d/BaR			$ echo bar>foo.d/bAr.hg.d/BaR
	$ echo bar>foo.d/baR.d.hg/bAR			$ echo bar>foo.d/baR.d.hg/bAR

tests/test-known.t

	#require killdaemons

	= Test the known() protocol function =			= Test the known() protocol function =

	Create a test repository:			Create a test repository:

	$ hg init repo			$ hg init repo
	$ cd repo			$ cd repo
	$ touch a ; hg add a ; hg ci -ma			$ touch a ; hg add a ; hg ci -ma
	$ touch b ; hg add b ; hg ci -mb			$ touch b ; hg add b ; hg ci -mb

tests/test-mq-qclone-http.t

	#require killdaemons

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

	$ echo "[extensions]" >> $HGRCPATH			$ echo "[extensions]" >> $HGRCPATH
	$ echo "mq=" >> $HGRCPATH			$ echo "mq=" >> $HGRCPATH
	$ mkdir webdir			$ mkdir webdir
	$ cd webdir			$ cd webdir
	$ hg init a			$ hg init a

tests/test-mq-qimport.t

	#require killdaemons

	$ cat > writelines.py <<EOF			$ cat > writelines.py <<EOF
	> import sys			> import sys
	> path = sys.argv[1]			> path = sys.argv[1]
	> args = sys.argv[2:]			> args = sys.argv[2:]
	> assert (len(args) % 2) == 0			> assert (len(args) % 2) == 0
	>			>
	> f = open(path, 'wb')			> f = open(path, 'wb')
	> for i in range(len(args)//2):			> for i in range(len(args)//2):

tests/test-phases-exchange.t

	#require killdaemons

	$ cat >> $HGRCPATH << EOF			$ cat >> $HGRCPATH << EOF
	> [extensions]			> [extensions]
	> phasereport=$TESTDIR/testlib/ext-phase-report.py			> phasereport=$TESTDIR/testlib/ext-phase-report.py
	> EOF			> EOF

	$ hgph() { hg log -G --template "{rev} {phase} {desc} - {node\|short}\n" $*; }			$ hgph() { hg log -G --template "{rev} {phase} {desc} - {node\|short}\n" $*; }

	$ mkcommit() {			$ mkcommit() {

tests/test-pull-http.t

	#require killdaemons

	#if no-windows			#if no-windows
	For debugging: this is a pretty simple test that is a good candidate			For debugging: this is a pretty simple test that is a good candidate
	for tracking down network-related bugs. Sometimes a command in this			for tracking down network-related bugs. Sometimes a command in this
	hangs, so having showstack pre-loaded is sometimes helpful. This also			hangs, so having showstack pre-loaded is sometimes helpful. This also
	gives us a test that at least proves showstack can be loaded.			gives us a test that at least proves showstack can be loaded.
	$ cat >> $HGRCPATH <<EOF			$ cat >> $HGRCPATH <<EOF
	> [extensions]			> [extensions]
	> showstack = $TESTDIR/../contrib/showstack.py			> showstack = $TESTDIR/../contrib/showstack.py

tests/test-push-http.t

	#require killdaemons

	#testcases bundle1 bundle2			#testcases bundle1 bundle2

	#if bundle1			#if bundle1
	$ cat << EOF >> $HGRCPATH			$ cat << EOF >> $HGRCPATH
	> [devel]			> [devel]
	> # This test is dedicated to interaction through old bundle			> # This test is dedicated to interaction through old bundle
	> legacy.exchange = bundle1			> legacy.exchange = bundle1
	> EOF			> EOF

tests/test-share.t

	#require killdaemons

	$ echo "[extensions]" >> $HGRCPATH			$ echo "[extensions]" >> $HGRCPATH
	$ echo "share = " >> $HGRCPATH			$ echo "share = " >> $HGRCPATH

	prepare repo1			prepare repo1

	$ hg init repo1			$ hg init repo1
	$ cd repo1			$ cd repo1
	$ echo a > a			$ echo a > a

tests/test-static-http.t

	#require killdaemons no-reposimplestore			#require no-reposimplestore

	$ hg clone http://localhost:$HGPORT/ copy			$ hg clone http://localhost:$HGPORT/ copy
	abort: * (glob)			abort: * (glob)
	[255]			[255]
	$ test -d copy			$ test -d copy
	[1]			[1]

	This server doesn't do range requests so it's basically only good for			This server doesn't do range requests so it's basically only good for

tests/test-subrepo-relative-path.t

	#require killdaemons

	Preparing the subrepository 'sub'			Preparing the subrepository 'sub'

	$ hg init sub			$ hg init sub
	$ echo sub > sub/sub			$ echo sub > sub/sub
	$ hg add -R sub			$ hg add -R sub
	adding sub/sub			adding sub/sub
	$ hg commit -R sub -m "sub import"			$ hg commit -R sub -m "sub import"

tests/test-transplant.t

	#require killdaemons

	$ cat <<EOF >> $HGRCPATH			$ cat <<EOF >> $HGRCPATH
	> [extensions]			> [extensions]
	> transplant=			> transplant=
	> EOF			> EOF

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

tests/test-treediscovery-legacy.t

	#require killdaemons

	Tests discovery against servers without getbundle support:			Tests discovery against servers without getbundle support:

	$ cat >> $HGRCPATH <<EOF			$ cat >> $HGRCPATH <<EOF
	> [ui]			> [ui]
	> logtemplate="{rev} {node\|short}: {desc} {branches}\n"			> logtemplate="{rev} {node\|short}: {desc} {branches}\n"
	> EOF			> EOF
	$ cp $HGRCPATH $HGRCPATH-withcap			$ cp $HGRCPATH $HGRCPATH-withcap

tests/test-treediscovery.t

	#require killdaemons

	Tests discovery against servers without getbundle support:			Tests discovery against servers without getbundle support:

	$ CAP="getbundle bundle2"			$ CAP="getbundle bundle2"
	$ . "$TESTDIR/notcapable"			$ . "$TESTDIR/notcapable"
	$ cat >> $HGRCPATH <<EOF			$ cat >> $HGRCPATH <<EOF
	> [ui]			> [ui]
	> logtemplate="{rev} {node\|short}: {desc} {branches}\n"			> logtemplate="{rev} {node\|short}: {desc} {branches}\n"
	> EOF			> EOF

tests/test-treemanifest.t

	#require killdaemons

	$ cat << EOF >> $HGRCPATH			$ cat << EOF >> $HGRCPATH
	> [ui]			> [ui]
	> ssh=$PYTHON "$TESTDIR/dummyssh"			> ssh=$PYTHON "$TESTDIR/dummyssh"
	> EOF			> EOF

	Set up repo			Set up repo

	$ hg --config experimental.treemanifest=True init repo			$ hg --config experimental.treemanifest=True init repo

tests/test-unbundlehash.t

	#require killdaemons

	Test wire protocol unbundle with hashed heads (capability: unbundlehash)			Test wire protocol unbundle with hashed heads (capability: unbundlehash)

	$ cat << EOF >> $HGRCPATH			$ cat << EOF >> $HGRCPATH
	> [devel]			> [devel]
	> # This tests is intended for bundle1 only.			> # This tests is intended for bundle1 only.
	> # bundle2 carries the head information inside the bundle itself and			> # bundle2 carries the head information inside the bundle itself and
	> # always uses 'force' as the heads value.			> # always uses 'force' as the heads value.
	> legacy.exchange = bundle1			> legacy.exchange = bundle1

tests/test-wireproto.t

	#require killdaemons

	Test wire protocol argument passing			Test wire protocol argument passing

	Setup repo:			Setup repo:

	$ hg init repo			$ hg init repo

	Local:			Local:

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	8457		May 5 2018, 10:03 PM	★	★
Diff 2	8472	rHGb4b7427b57863491ecd92a519233f9dce99645f2	Apr 30 2018, 10:54 PM	★	★