comparison tests/test-hgweb.t @ 25474:8c14f87bd0ae

tests: drop DAEMON_PIDS from killdaemons calls
author Matt Mackall <mpm@selenic.com>
date Mon, 08 Jun 2015 14:55:40 -0500
parents 4d2b9b304ad0
children 3bb6f5f478a7
comparison
equal deleted inserted replaced
25473:123c99034cb6 25474:8c14f87bd0ae
319 </html> 319 </html>
320 320
321 321
322 stop and restart 322 stop and restart
323 323
324 $ killdaemons.py $DAEMON_PIDS 324 $ killdaemons.py
325 $ hg serve -p $HGPORT -d --pid-file=hg.pid -A access.log 325 $ hg serve -p $HGPORT -d --pid-file=hg.pid -A access.log
326 $ cat hg.pid >> $DAEMON_PIDS 326 $ cat hg.pid >> $DAEMON_PIDS
327 327
328 Test the access/error files are opened in append mode 328 Test the access/error files are opened in append mode
329 329
592 > default = 'shortlog' 592 > default = 'shortlog'
593 > shortlog = 'access to outside of templates directory\n' 593 > shortlog = 'access to outside of templates directory\n'
594 > mimetype = 'text/plain' 594 > mimetype = 'text/plain'
595 > EOF 595 > EOF
596 596
597 $ killdaemons.py $DAEMON_PIDS 597 $ killdaemons.py
598 $ hg serve -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log \ 598 $ hg serve -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log \
599 > --config web.style=fallback --config web.templates=x/templates 599 > --config web.style=fallback --config web.templates=x/templates
600 $ cat hg.pid >> $DAEMON_PIDS 600 $ cat hg.pid >> $DAEMON_PIDS
601 601
602 $ get-with-headers.py localhost:$HGPORT "?style=`pwd`/x" 602 $ get-with-headers.py localhost:$HGPORT "?style=`pwd`/x"
623 623
624 $ cat errors.log 624 $ cat errors.log
625 625
626 Uncaught exceptions result in a logged error and canned HTTP response 626 Uncaught exceptions result in a logged error and canned HTTP response
627 627
628 $ killdaemons.py $DAEMON_PIDS 628 $ killdaemons.py
629 $ hg --config extensions.hgweberror=$TESTDIR/hgweberror.py serve -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log 629 $ hg --config extensions.hgweberror=$TESTDIR/hgweberror.py serve -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
630 $ cat hg.pid >> $DAEMON_PIDS 630 $ cat hg.pid >> $DAEMON_PIDS
631 631
632 $ get-with-headers.py localhost:$HGPORT 'raiseerror' transfer-encoding content-type 632 $ get-with-headers.py localhost:$HGPORT 'raiseerror' transfer-encoding content-type
633 500 Internal Server Error 633 500 Internal Server Error
634 transfer-encoding: chunked 634 transfer-encoding: chunked
635 635
636 Internal Server Error (no-eol) 636 Internal Server Error (no-eol)
637 [1] 637 [1]
638 638
639 $ killdaemons.py $DAEMON_PIDS 639 $ killdaemons.py
640 $ head -1 errors.log 640 $ head -1 errors.log
641 .* Exception happened during processing request '/raiseerror': (re) 641 .* Exception happened during processing request '/raiseerror': (re)
642 642
643 Uncaught exception after partial content sent 643 Uncaught exception after partial content sent
644 644
650 content-type: text/plain 650 content-type: text/plain
651 651
652 partial content 652 partial content
653 Internal Server Error (no-eol) 653 Internal Server Error (no-eol)
654 654
655 $ killdaemons.py $DAEMON_PIDS 655 $ killdaemons.py
656 $ cd .. 656 $ cd ..