# HG changeset patch # User Matt Mackall # Date 1433793340 18000 # Node ID 8c14f87bd0ae8bb00d3aa43077649a09f0d80d57 # Parent 123c99034cb643ee46d0b54d4a583054be438d13 tests: drop DAEMON_PIDS from killdaemons calls diff -r 123c99034cb6 -r 8c14f87bd0ae tests/test-archive.t --- a/tests/test-archive.t Mon Jun 08 14:21:45 2015 -0500 +++ b/tests/test-archive.t Mon Jun 08 14:55:40 2015 -0500 @@ -31,7 +31,7 @@ > echo % $3 and $4 disallowed should both give 403 > get-with-headers.py localhost:$HGPORT "archive/tip.$3" | head -n 1 > get-with-headers.py localhost:$HGPORT "archive/tip.$4" | head -n 1 - > killdaemons.py $DAEMON_PIDS + > killdaemons.py > cat errors.log > cp .hg/hgrc-base .hg/hgrc > } @@ -134,7 +134,7 @@ $ python getarchive.py "$TIP" gz relre:baz HTTP Error 404: file(s) not found: relre:baz - $ killdaemons.py $DAEMON_PIDS + $ killdaemons.py $ hg archive -t tar test.tar $ tar tf test.tar diff -r 123c99034cb6 -r 8c14f87bd0ae tests/test-bad-pull.t --- a/tests/test-bad-pull.t Mon Jun 08 14:21:45 2015 -0500 +++ b/tests/test-bad-pull.t Mon Jun 08 14:55:40 2015 -0500 @@ -18,4 +18,4 @@ $ hg clone http://localhost:$HGPORT/foo copy2 abort: HTTP Error 404: * (glob) [255] - $ killdaemons.py $DAEMON_PIDS + $ killdaemons.py diff -r 123c99034cb6 -r 8c14f87bd0ae tests/test-bookmarks-pushpull.t --- a/tests/test-bookmarks-pushpull.t Mon Jun 08 14:21:45 2015 -0500 +++ b/tests/test-bookmarks-pushpull.t Mon Jun 08 14:55:40 2015 -0500 @@ -284,7 +284,7 @@ (new config needs a server restart) $ cd .. - $ killdaemons.py $DAEMON_PIDS + $ killdaemons.py $ hg -R pull-race serve -p $HGPORT -d --pid-file=pull-race.pid -E main-error.log $ cat pull-race.pid >> $DAEMON_PIDS $ cd pull-race2 @@ -321,7 +321,7 @@ (new config need server restart) - $ killdaemons.py $DAEMON_PIDS + $ killdaemons.py $ hg -R ../pull-race serve -p $HGPORT -d --pid-file=../pull-race.pid -E main-error.log $ cat ../pull-race.pid >> $DAEMON_PIDS @@ -347,7 +347,7 @@ (done with this section of the test) - $ killdaemons.py $DAEMON_PIDS + $ killdaemons.py $ cd ../b diverging a remote bookmark fails @@ -743,7 +743,7 @@ > push_ssl = false > allow_push = * > EOF - $ killdaemons.py $DAEMON_PIDS + $ killdaemons.py $ hg -R ../issue4455-dest serve -p $HGPORT -d --pid-file=../issue4455.pid -E ../issue4455-error.log $ cat ../issue4455.pid >> $DAEMON_PIDS diff -r 123c99034cb6 -r 8c14f87bd0ae tests/test-bundle2-exchange.t --- a/tests/test-bundle2-exchange.t Mon Jun 08 14:21:45 2015 -0500 +++ b/tests/test-bundle2-exchange.t Mon Jun 08 14:55:40 2015 -0500 @@ -466,7 +466,7 @@ > failpush=$TESTTMP/failpush.py > EOF - $ killdaemons.py $DAEMON_PIDS + $ killdaemons.py $ hg -R other serve -p $HGPORT2 -d --pid-file=other.pid -E other-error.log $ cat other.pid >> $DAEMON_PIDS @@ -562,7 +562,7 @@ > txnabort.failpush = sh -c "echo 'Cleaning up the mess...'" > EOF - $ killdaemons.py $DAEMON_PIDS + $ killdaemons.py $ hg -R other serve -p $HGPORT2 -d --pid-file=other.pid -E other-error.log $ cat other.pid >> $DAEMON_PIDS @@ -625,7 +625,7 @@ $ cat << EOF >> $HGRCPATH > pretxnchangegroup = sh -c "echo 'Fail early!'; false" > EOF - $ killdaemons.py $DAEMON_PIDS # reload http config + $ killdaemons.py # reload http config $ hg -R other serve -p $HGPORT2 -d --pid-file=other.pid -E other-error.log $ cat other.pid >> $DAEMON_PIDS diff -r 123c99034cb6 -r 8c14f87bd0ae tests/test-bundle2-remote-changegroup.t --- a/tests/test-bundle2-remote-changegroup.t Mon Jun 08 14:21:45 2015 -0500 +++ b/tests/test-bundle2-remote-changegroup.t Mon Jun 08 14:55:40 2015 -0500 @@ -589,4 +589,4 @@ $ rm -rf clone - $ killdaemons.py $DAEMON_PIDS + $ killdaemons.py diff -r 123c99034cb6 -r 8c14f87bd0ae tests/test-help.t --- a/tests/test-help.t Mon Jun 08 14:21:45 2015 -0500 +++ b/tests/test-help.t Mon Jun 08 14:55:40 2015 -0500 @@ -2250,6 +2250,6 @@ - $ killdaemons.py $DAEMON_PIDS + $ killdaemons.py #endif diff -r 123c99034cb6 -r 8c14f87bd0ae tests/test-hgweb-commands.t --- a/tests/test-hgweb-commands.t Mon Jun 08 14:21:45 2015 -0500 +++ b/tests/test-hgweb-commands.t Mon Jun 08 14:55:40 2015 -0500 @@ -2043,7 +2043,7 @@ Stop and restart with HGENCODING=cp932 and preferuncompressed - $ killdaemons.py $DAEMON_PIDS + $ killdaemons.py $ HGENCODING=cp932 hg serve --config server.preferuncompressed=True -n test \ > -p $HGPORT -d --pid-file=hg.pid -E errors.log $ cat hg.pid >> $DAEMON_PIDS @@ -2073,7 +2073,7 @@ ERRORS ENCOUNTERED $ cat errors.log - $ killdaemons.py $DAEMON_PIDS + $ killdaemons.py $ cd .. diff -r 123c99034cb6 -r 8c14f87bd0ae tests/test-hgweb-diffs.t --- a/tests/test-hgweb-diffs.t Mon Jun 08 14:21:45 2015 -0500 +++ b/tests/test-hgweb-diffs.t Mon Jun 08 14:55:40 2015 -0500 @@ -302,7 +302,7 @@ set up hgweb with git diffs - $ killdaemons.py $DAEMON_PIDS + $ killdaemons.py $ hg serve --config 'diff.git=1' -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log $ cat hg.pid >> $DAEMON_PIDS @@ -1094,7 +1094,7 @@ raw revision with diff block numbers - $ killdaemons.py $DAEMON_PIDS + $ killdaemons.py $ cat < .hg/hgrc > [web] > templates = rawdiff @@ -1131,7 +1131,7 @@ @@ -0,0 +1,1 @@ +b - $ killdaemons.py $DAEMON_PIDS + $ killdaemons.py $ rm .hg/hgrc rawdiff/map $ rmdir rawdiff $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log diff -r 123c99034cb6 -r 8c14f87bd0ae tests/test-hgweb.t --- a/tests/test-hgweb.t Mon Jun 08 14:21:45 2015 -0500 +++ b/tests/test-hgweb.t Mon Jun 08 14:55:40 2015 -0500 @@ -321,7 +321,7 @@ stop and restart - $ killdaemons.py $DAEMON_PIDS + $ killdaemons.py $ hg serve -p $HGPORT -d --pid-file=hg.pid -A access.log $ cat hg.pid >> $DAEMON_PIDS @@ -594,7 +594,7 @@ > mimetype = 'text/plain' > EOF - $ killdaemons.py $DAEMON_PIDS + $ killdaemons.py $ hg serve -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log \ > --config web.style=fallback --config web.templates=x/templates $ cat hg.pid >> $DAEMON_PIDS @@ -625,7 +625,7 @@ Uncaught exceptions result in a logged error and canned HTTP response - $ killdaemons.py $DAEMON_PIDS + $ killdaemons.py $ hg --config extensions.hgweberror=$TESTDIR/hgweberror.py serve -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log $ cat hg.pid >> $DAEMON_PIDS @@ -636,7 +636,7 @@ Internal Server Error (no-eol) [1] - $ killdaemons.py $DAEMON_PIDS + $ killdaemons.py $ head -1 errors.log .* Exception happened during processing request '/raiseerror': (re) @@ -652,5 +652,5 @@ partial content Internal Server Error (no-eol) - $ killdaemons.py $DAEMON_PIDS + $ killdaemons.py $ cd .. diff -r 123c99034cb6 -r 8c14f87bd0ae tests/test-hgwebdir.t --- a/tests/test-hgwebdir.t Mon Jun 08 14:21:45 2015 -0500 +++ b/tests/test-hgwebdir.t Mon Jun 08 14:55:40 2015 -0500 @@ -903,7 +903,7 @@ Test collapse = True - $ killdaemons.py $DAEMON_PIDS + $ killdaemons.py $ cat >> paths.conf < [web] > collapse=true @@ -989,7 +989,7 @@ Test descend = False - $ killdaemons.py $DAEMON_PIDS + $ killdaemons.py $ cat >> paths.conf < descend=false > EOF @@ -1050,7 +1050,7 @@ $ hg id http://localhost:$HGPORT1/astar 8580ff50825a - $ killdaemons.py $DAEMON_PIDS + $ killdaemons.py $ cat > paths.conf < [paths] > t/a = $root/a @@ -1078,7 +1078,7 @@ Test collapse = True - $ killdaemons.py $DAEMON_PIDS + $ killdaemons.py $ cat >> paths.conf < [web] > collapse=true @@ -1103,7 +1103,7 @@ test descend = False - $ killdaemons.py $DAEMON_PIDS + $ killdaemons.py $ cat >> paths.conf < descend=false > EOF @@ -1123,7 +1123,7 @@ /t/a/ /t/b/ - $ killdaemons.py $DAEMON_PIDS + $ killdaemons.py $ cat > paths.conf < [paths] > nostore = $root/nostore @@ -1227,7 +1227,7 @@ $ get-with-headers.py localhost:$HGPORT2 'a/rss-log' | grep 'http://hg.example.com:8080/a/rev/8580ff50825a - $ killdaemons.py $DAEMON_PIDS + $ killdaemons.py $ hg serve --config web.baseurl=http://hg.example.com:8080/foo/ -p $HGPORT2 -d \ > --pid-file=hg.pid --webdir-conf collections.conf \ > -A access-collections-2.log -E error-collections-2.log diff -r 123c99034cb6 -r 8c14f87bd0ae tests/test-highlight.t --- a/tests/test-highlight.t Mon Jun 08 14:21:45 2015 -0500 +++ b/tests/test-highlight.t Mon Jun 08 14:55:40 2015 -0500 @@ -549,7 +549,7 @@ errors encountered $ cat errors.log - $ killdaemons.py $DAEMON_PIDS + $ killdaemons.py Change the pygments style @@ -583,7 +583,7 @@ $ hg ci -Ama adding eucjp.txt $ hgserveget () { - > killdaemons.py $DAEMON_PIDS + > killdaemons.py > echo % HGENCODING="$1" hg serve > HGENCODING="$1" hg serve -p $HGPORT -d -n test --pid-file=hg.pid -E errors.log > cat hg.pid >> $DAEMON_PIDS diff -r 123c99034cb6 -r 8c14f87bd0ae tests/test-known.t --- a/tests/test-known.t Mon Jun 08 14:21:45 2015 -0500 +++ b/tests/test-known.t Mon Jun 08 14:55:40 2015 -0500 @@ -35,5 +35,5 @@ $ hg debugknown http://localhost:$HGPORT/ $ cat error.log - $ killdaemons.py $DAEMON_PIDS + $ killdaemons.py diff -r 123c99034cb6 -r 8c14f87bd0ae tests/test-largefiles-misc.t --- a/tests/test-largefiles-misc.t Mon Jun 08 14:21:45 2015 -0500 +++ b/tests/test-largefiles-misc.t Mon Jun 08 14:55:40 2015 -0500 @@ -984,7 +984,7 @@ > EOF $ hg -R pull-dst -q pull -u http://localhost:$HGPORT - $ killdaemons.py $DAEMON_PIDS + $ killdaemons.py #endif Test overridden functions work correctly even for repos disabling diff -r 123c99034cb6 -r 8c14f87bd0ae tests/test-largefiles-wireproto.t --- a/tests/test-largefiles-wireproto.t Mon Jun 08 14:21:45 2015 -0500 +++ b/tests/test-largefiles-wireproto.t Mon Jun 08 14:55:40 2015 -0500 @@ -106,7 +106,7 @@ [255] used all HGPORTs, kill all daemons - $ killdaemons.py $DAEMON_PIDS + $ killdaemons.py #endif vanilla clients locked out from largefiles ssh repos @@ -291,6 +291,6 @@ $ rm -rf empty http-clone* used all HGPORTs, kill all daemons - $ killdaemons.py $DAEMON_PIDS + $ killdaemons.py #endif diff -r 123c99034cb6 -r 8c14f87bd0ae tests/test-largefiles.t --- a/tests/test-largefiles.t Mon Jun 08 14:21:45 2015 -0500 +++ b/tests/test-largefiles.t Mon Jun 08 14:55:40 2015 -0500 @@ -213,7 +213,7 @@ -rw-r--r-- 9 normal4 - $ killdaemons.py $DAEMON_PIDS + $ killdaemons.py #endif Test archiving the various revisions. These hit corner cases known with diff -r 123c99034cb6 -r 8c14f87bd0ae tests/test-mq-qclone-http.t --- a/tests/test-mq-qclone-http.t Mon Jun 08 14:21:45 2015 -0500 +++ b/tests/test-mq-qclone-http.t Mon Jun 08 14:55:40 2015 -0500 @@ -152,5 +152,5 @@ $ hg --cwd d log --mq --template '{rev} {desc|firstline}\n' 0 b.patch - $ killdaemons.py $DAEMON_PIDS + $ killdaemons.py diff -r 123c99034cb6 -r 8c14f87bd0ae tests/test-mq-qimport.t --- a/tests/test-mq-qimport.t Mon Jun 08 14:21:45 2015 -0500 +++ b/tests/test-mq-qimport.t Mon Jun 08 14:55:40 2015 -0500 @@ -289,4 +289,4 @@ $ cd .. - $ killdaemons.py $DAEMON_PIDS + $ killdaemons.py diff -r 123c99034cb6 -r 8c14f87bd0ae tests/test-obsolete.t --- a/tests/test-obsolete.t Mon Jun 08 14:21:45 2015 -0500 +++ b/tests/test-obsolete.t Mon Jun 08 14:55:40 2015 -0500 @@ -756,7 +756,7 @@ no changes found [1] - $ killdaemons.py $DAEMON_PIDS + $ killdaemons.py #endif @@ -893,7 +893,7 @@ $ get-with-headers.py --headeronly localhost:$HGPORT 'annotate/tip/bar' 200 Script output follows - $ killdaemons.py $DAEMON_PIDS + $ killdaemons.py #endif diff -r 123c99034cb6 -r 8c14f87bd0ae tests/test-phases-exchange.t --- a/tests/test-phases-exchange.t Mon Jun 08 14:21:45 2015 -0500 +++ b/tests/test-phases-exchange.t Mon Jun 08 14:55:40 2015 -0500 @@ -1193,6 +1193,6 @@ $ cd .. - $ killdaemons.py $DAEMON_PIDS + $ killdaemons.py #endif diff -r 123c99034cb6 -r 8c14f87bd0ae tests/test-pull-http.t --- a/tests/test-pull-http.t Mon Jun 08 14:21:45 2015 -0500 +++ b/tests/test-pull-http.t Mon Jun 08 14:55:40 2015 -0500 @@ -40,7 +40,7 @@ [ui] # name and email (local to this repository, optional), e.g. # username = Jane Doe - $ killdaemons.py $DAEMON_PIDS + $ killdaemons.py expect error, cloning not allowed @@ -55,7 +55,7 @@ $ hg clone http://localhost:$HGPORT/ test4 --config experimental.bundle2-exp=False abort: authorization failed [255] - $ killdaemons.py $DAEMON_PIDS + $ killdaemons.py serve errors diff -r 123c99034cb6 -r 8c14f87bd0ae tests/test-push-http-bundle1.t --- a/tests/test-push-http-bundle1.t Mon Jun 08 14:21:45 2015 -0500 +++ b/tests/test-push-http-bundle1.t Mon Jun 08 14:55:40 2015 -0500 @@ -27,7 +27,7 @@ > cat hg.pid >> $DAEMON_PIDS > hg --cwd ../test2 push http://localhost:$HGPORT/ > exitstatus=$? - > killdaemons.py $DAEMON_PIDS + > killdaemons.py > echo % serve errors > cat errors.log > return $exitstatus diff -r 123c99034cb6 -r 8c14f87bd0ae tests/test-push-http.t --- a/tests/test-push-http.t Mon Jun 08 14:21:45 2015 -0500 +++ b/tests/test-push-http.t Mon Jun 08 14:55:40 2015 -0500 @@ -17,7 +17,7 @@ > cat hg.pid >> $DAEMON_PIDS > hg --cwd ../test2 push http://localhost:$HGPORT/ > exitstatus=$? - > killdaemons.py $DAEMON_PIDS + > killdaemons.py > echo % serve errors > cat errors.log > return $exitstatus diff -r 123c99034cb6 -r 8c14f87bd0ae tests/test-setdiscovery.t --- a/tests/test-setdiscovery.t Mon Jun 08 14:21:45 2015 -0500 +++ b/tests/test-setdiscovery.t Mon Jun 08 14:55:40 2015 -0500 @@ -346,7 +346,7 @@ searching for changes e64a39e7da8b - $ killdaemons.py $DAEMON_PIDS + $ killdaemons.py $ cut -d' ' -f6- access.log | grep -v cmd=known # cmd=known uses random sampling "GET /?cmd=capabilities HTTP/1.1" 200 - "GET /?cmd=batch HTTP/1.1" 200 - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D513314ca8b3ae4dac8eec56966265b00fcf866db diff -r 123c99034cb6 -r 8c14f87bd0ae tests/test-share.t --- a/tests/test-share.t Mon Jun 08 14:21:45 2015 -0500 +++ b/tests/test-share.t Mon Jun 08 14:55:40 2015 -0500 @@ -299,5 +299,5 @@ Explicitly kill daemons to let the test exit on Windows - $ killdaemons.py $DAEMON_PIDS + $ killdaemons.py diff -r 123c99034cb6 -r 8c14f87bd0ae tests/test-static-http.t --- a/tests/test-static-http.t Mon Jun 08 14:21:45 2015 -0500 +++ b/tests/test-static-http.t Mon Jun 08 14:55:40 2015 -0500 @@ -159,4 +159,4 @@ $ hg clone static-http://localhost:$HGPORT/notarepo local3 abort: 'http://localhost:$HGPORT/notarepo' does not appear to be an hg repository! [255] - $ killdaemons.py $DAEMON_PIDS + $ killdaemons.py diff -r 123c99034cb6 -r 8c14f87bd0ae tests/test-subrepo-relative-path.t --- a/tests/test-subrepo-relative-path.t Mon Jun 08 14:21:45 2015 -0500 +++ b/tests/test-subrepo-relative-path.t Mon Jun 08 14:55:40 2015 -0500 @@ -70,7 +70,7 @@ source ../sub revision 863c1745b441bd97a8c4a096e87793073f4fb215 - $ killdaemons.py $DAEMON_PIDS + $ killdaemons.py subrepo paths with ssh urls diff -r 123c99034cb6 -r 8c14f87bd0ae tests/test-transplant.t --- a/tests/test-transplant.t Mon Jun 08 14:21:45 2015 -0500 +++ b/tests/test-transplant.t Mon Jun 08 14:55:40 2015 -0500 @@ -788,5 +788,5 @@ Explicitly kill daemons to let the test exit on Windows - $ killdaemons.py $DAEMON_PIDS + $ killdaemons.py diff -r 123c99034cb6 -r 8c14f87bd0ae tests/test-treediscovery-legacy.t --- a/tests/test-treediscovery-legacy.t Mon Jun 08 14:21:45 2015 -0500 +++ b/tests/test-treediscovery-legacy.t Mon Jun 08 14:55:40 2015 -0500 @@ -33,7 +33,7 @@ > cat hg.pid >> $DAEMON_PIDS > } $ tstop() { - > killdaemons.py $DAEMON_PIDS + > killdaemons.py > cp $HGRCPATH-withcap $HGRCPATH > } diff -r 123c99034cb6 -r 8c14f87bd0ae tests/test-treediscovery.t --- a/tests/test-treediscovery.t Mon Jun 08 14:21:45 2015 -0500 +++ b/tests/test-treediscovery.t Mon Jun 08 14:55:40 2015 -0500 @@ -21,7 +21,7 @@ > cat hg.pid >> $DAEMON_PIDS > } $ tstop() { - > killdaemons.py $DAEMON_PIDS + > killdaemons.py > [ "$1" ] && cut -d' ' -f6- access.log && cat errors.log > rm access.log errors.log > } diff -r 123c99034cb6 -r 8c14f87bd0ae tests/test-unbundlehash.t --- a/tests/test-unbundlehash.t Mon Jun 08 14:21:45 2015 -0500 +++ b/tests/test-unbundlehash.t Mon Jun 08 14:55:40 2015 -0500 @@ -41,5 +41,5 @@ Explicitly kill daemons to let the test exit on Windows - $ killdaemons.py $DAEMON_PIDS + $ killdaemons.py diff -r 123c99034cb6 -r 8c14f87bd0ae tests/test-wireproto.t --- a/tests/test-wireproto.t Mon Jun 08 14:21:45 2015 -0500 +++ b/tests/test-wireproto.t Mon Jun 08 14:55:40 2015 -0500 @@ -114,5 +114,5 @@ Explicitly kill daemons to let the test exit on Windows - $ killdaemons.py $DAEMON_PIDS + $ killdaemons.py