# HG changeset patch # User Gregory Szorc # Date 1525143295 25200 # Node ID b4b7427b57863491ecd92a519233f9dce99645f2 # Parent 8fb9985382be03ba4565349981ceeb7bf779fbe2 tests: remove #require killdaemons 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. Differential Revision: https://phab.mercurial-scm.org/D3442 diff -r 8fb9985382be -r b4b7427b5786 tests/test-bad-pull.t --- a/tests/test-bad-pull.t Sat May 05 18:35:16 2018 -0700 +++ b/tests/test-bad-pull.t Mon Apr 30 19:54:55 2018 -0700 @@ -1,4 +1,4 @@ -#require serve killdaemons +#require serve $ hg clone http://localhost:$HGPORT/ copy abort: * (glob) diff -r 8fb9985382be -r b4b7427b5786 tests/test-bundle2-remote-changegroup.t --- a/tests/test-bundle2-remote-changegroup.t Sat May 05 18:35:16 2018 -0700 +++ b/tests/test-bundle2-remote-changegroup.t Mon Apr 30 19:54:55 2018 -0700 @@ -1,5 +1,3 @@ -#require killdaemons - #testcases sshv1 sshv2 #if sshv2 diff -r 8fb9985382be -r b4b7427b5786 tests/test-http-bad-server.t --- a/tests/test-http-bad-server.t Sat May 05 18:35:16 2018 -0700 +++ b/tests/test-http-bad-server.t Mon Apr 30 19:54:55 2018 -0700 @@ -1,4 +1,4 @@ -#require killdaemons serve zstd +#require serve zstd Client version is embedded in HTTP request and is effectively dynamic. Pin the version so behavior is deterministic. diff -r 8fb9985382be -r b4b7427b5786 tests/test-http-branchmap.t --- a/tests/test-http-branchmap.t Sat May 05 18:35:16 2018 -0700 +++ b/tests/test-http-branchmap.t Mon Apr 30 19:54:55 2018 -0700 @@ -1,5 +1,3 @@ -#require killdaemons - $ hgserve() { > hg serve -a localhost -p $HGPORT1 -d --pid-file=hg.pid \ > -E errors.log -v $@ > startup.log diff -r 8fb9985382be -r b4b7427b5786 tests/test-http-permissions.t --- a/tests/test-http-permissions.t Sat May 05 18:35:16 2018 -0700 +++ b/tests/test-http-permissions.t Mon Apr 30 19:54:55 2018 -0700 @@ -1,5 +1,3 @@ -#require killdaemons - $ cat > fakeremoteuser.py << EOF > import os > from mercurial.hgweb import hgweb_mod diff -r 8fb9985382be -r b4b7427b5786 tests/test-http.t --- a/tests/test-http.t Sat May 05 18:35:16 2018 -0700 +++ b/tests/test-http.t Mon Apr 30 19:54:55 2018 -0700 @@ -1,4 +1,4 @@ -#require killdaemons serve +#require serve $ hg init test $ cd test diff -r 8fb9985382be -r b4b7427b5786 tests/test-known.t --- a/tests/test-known.t Sat May 05 18:35:16 2018 -0700 +++ b/tests/test-known.t Mon Apr 30 19:54:55 2018 -0700 @@ -1,5 +1,3 @@ -#require killdaemons - = Test the known() protocol function = Create a test repository: diff -r 8fb9985382be -r b4b7427b5786 tests/test-mq-qclone-http.t --- a/tests/test-mq-qclone-http.t Sat May 05 18:35:16 2018 -0700 +++ b/tests/test-mq-qclone-http.t Mon Apr 30 19:54:55 2018 -0700 @@ -1,5 +1,3 @@ -#require killdaemons - hide outer repo $ hg init diff -r 8fb9985382be -r b4b7427b5786 tests/test-mq-qimport.t --- a/tests/test-mq-qimport.t Sat May 05 18:35:16 2018 -0700 +++ b/tests/test-mq-qimport.t Mon Apr 30 19:54:55 2018 -0700 @@ -1,5 +1,3 @@ -#require killdaemons - $ cat > writelines.py < import sys > path = sys.argv[1] diff -r 8fb9985382be -r b4b7427b5786 tests/test-phases-exchange.t --- a/tests/test-phases-exchange.t Sat May 05 18:35:16 2018 -0700 +++ b/tests/test-phases-exchange.t Mon Apr 30 19:54:55 2018 -0700 @@ -1,5 +1,3 @@ -#require killdaemons - $ cat >> $HGRCPATH << EOF > [extensions] > phasereport=$TESTDIR/testlib/ext-phase-report.py diff -r 8fb9985382be -r b4b7427b5786 tests/test-pull-http.t --- a/tests/test-pull-http.t Sat May 05 18:35:16 2018 -0700 +++ b/tests/test-pull-http.t Mon Apr 30 19:54:55 2018 -0700 @@ -1,5 +1,3 @@ -#require killdaemons - #if no-windows For debugging: this is a pretty simple test that is a good candidate for tracking down network-related bugs. Sometimes a command in this diff -r 8fb9985382be -r b4b7427b5786 tests/test-push-http.t --- a/tests/test-push-http.t Sat May 05 18:35:16 2018 -0700 +++ b/tests/test-push-http.t Mon Apr 30 19:54:55 2018 -0700 @@ -1,5 +1,3 @@ -#require killdaemons - #testcases bundle1 bundle2 #if bundle1 diff -r 8fb9985382be -r b4b7427b5786 tests/test-share.t --- a/tests/test-share.t Sat May 05 18:35:16 2018 -0700 +++ b/tests/test-share.t Mon Apr 30 19:54:55 2018 -0700 @@ -1,5 +1,3 @@ -#require killdaemons - $ echo "[extensions]" >> $HGRCPATH $ echo "share = " >> $HGRCPATH diff -r 8fb9985382be -r b4b7427b5786 tests/test-static-http.t --- a/tests/test-static-http.t Sat May 05 18:35:16 2018 -0700 +++ b/tests/test-static-http.t Mon Apr 30 19:54:55 2018 -0700 @@ -1,4 +1,4 @@ -#require killdaemons no-reposimplestore +#require no-reposimplestore $ hg clone http://localhost:$HGPORT/ copy abort: * (glob) diff -r 8fb9985382be -r b4b7427b5786 tests/test-subrepo-relative-path.t --- a/tests/test-subrepo-relative-path.t Sat May 05 18:35:16 2018 -0700 +++ b/tests/test-subrepo-relative-path.t Mon Apr 30 19:54:55 2018 -0700 @@ -1,5 +1,3 @@ -#require killdaemons - Preparing the subrepository 'sub' $ hg init sub diff -r 8fb9985382be -r b4b7427b5786 tests/test-transplant.t --- a/tests/test-transplant.t Sat May 05 18:35:16 2018 -0700 +++ b/tests/test-transplant.t Mon Apr 30 19:54:55 2018 -0700 @@ -1,5 +1,3 @@ -#require killdaemons - $ cat <> $HGRCPATH > [extensions] > transplant= diff -r 8fb9985382be -r b4b7427b5786 tests/test-treediscovery-legacy.t --- a/tests/test-treediscovery-legacy.t Sat May 05 18:35:16 2018 -0700 +++ b/tests/test-treediscovery-legacy.t Mon Apr 30 19:54:55 2018 -0700 @@ -1,5 +1,3 @@ -#require killdaemons - Tests discovery against servers without getbundle support: $ cat >> $HGRCPATH <> $HGRCPATH > [ui] > ssh=$PYTHON "$TESTDIR/dummyssh" diff -r 8fb9985382be -r b4b7427b5786 tests/test-unbundlehash.t --- a/tests/test-unbundlehash.t Sat May 05 18:35:16 2018 -0700 +++ b/tests/test-unbundlehash.t Mon Apr 30 19:54:55 2018 -0700 @@ -1,5 +1,3 @@ -#require killdaemons - Test wire protocol unbundle with hashed heads (capability: unbundlehash) $ cat << EOF >> $HGRCPATH diff -r 8fb9985382be -r b4b7427b5786 tests/test-wireproto.t --- a/tests/test-wireproto.t Sat May 05 18:35:16 2018 -0700 +++ b/tests/test-wireproto.t Mon Apr 30 19:54:55 2018 -0700 @@ -1,5 +1,3 @@ -#require killdaemons - Test wire protocol argument passing Setup repo: