Mercurial > hg
changeset 37845:b4b7427b5786
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
| author | Gregory Szorc <gregory.szorc@gmail.com> |
|---|---|
| date | Mon, 30 Apr 2018 19:54:55 -0700 |
| parents | 8fb9985382be |
| children | 89793289c891 |
| files | tests/test-bad-pull.t tests/test-bundle2-remote-changegroup.t tests/test-http-bad-server.t tests/test-http-branchmap.t tests/test-http-permissions.t tests/test-http.t tests/test-known.t tests/test-mq-qclone-http.t tests/test-mq-qimport.t tests/test-phases-exchange.t tests/test-pull-http.t tests/test-push-http.t tests/test-share.t tests/test-static-http.t tests/test-subrepo-relative-path.t tests/test-transplant.t tests/test-treediscovery-legacy.t tests/test-treediscovery.t tests/test-treemanifest.t tests/test-unbundlehash.t tests/test-wireproto.t |
| diffstat | 21 files changed, 4 insertions(+), 38 deletions(-) [+] |
line wrap: on
line diff
--- 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)
--- 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
--- 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.
--- 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
--- 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
--- 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
--- 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:
--- 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
--- 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 <<EOF > import sys > path = sys.argv[1]
--- 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
--- 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
--- 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
--- 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
--- 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)
--- 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
--- 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 <<EOF >> $HGRCPATH > [extensions] > transplant=
--- 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 <<EOF
--- a/tests/test-treediscovery.t Sat May 05 18:35:16 2018 -0700 +++ b/tests/test-treediscovery.t Mon Apr 30 19:54:55 2018 -0700 @@ -1,5 +1,3 @@ -#require killdaemons - Tests discovery against servers without getbundle support: $ CAP="getbundle bundle2"
--- a/tests/test-treemanifest.t Sat May 05 18:35:16 2018 -0700 +++ b/tests/test-treemanifest.t Mon Apr 30 19:54:55 2018 -0700 @@ -1,5 +1,3 @@ -#require killdaemons - $ cat << EOF >> $HGRCPATH > [ui] > ssh=$PYTHON "$TESTDIR/dummyssh"