comparison tests/test-bundle2-exchange.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 46727fea7a00
comparison
equal deleted inserted replaced
25473:123c99034cb6 25474:8c14f87bd0ae
464 $ cat << EOF >> $HGRCPATH 464 $ cat << EOF >> $HGRCPATH
465 > [extensions] 465 > [extensions]
466 > failpush=$TESTTMP/failpush.py 466 > failpush=$TESTTMP/failpush.py
467 > EOF 467 > EOF
468 468
469 $ killdaemons.py $DAEMON_PIDS 469 $ killdaemons.py
470 $ hg -R other serve -p $HGPORT2 -d --pid-file=other.pid -E other-error.log 470 $ hg -R other serve -p $HGPORT2 -d --pid-file=other.pid -E other-error.log
471 $ cat other.pid >> $DAEMON_PIDS 471 $ cat other.pid >> $DAEMON_PIDS
472 472
473 Doing the actual push: Abort error 473 Doing the actual push: Abort error
474 474
560 > [hooks] 560 > [hooks]
561 > pretxnclose.failpush = sh -c "echo 'You shall not pass!'; false" 561 > pretxnclose.failpush = sh -c "echo 'You shall not pass!'; false"
562 > txnabort.failpush = sh -c "echo 'Cleaning up the mess...'" 562 > txnabort.failpush = sh -c "echo 'Cleaning up the mess...'"
563 > EOF 563 > EOF
564 564
565 $ killdaemons.py $DAEMON_PIDS 565 $ killdaemons.py
566 $ hg -R other serve -p $HGPORT2 -d --pid-file=other.pid -E other-error.log 566 $ hg -R other serve -p $HGPORT2 -d --pid-file=other.pid -E other-error.log
567 $ cat other.pid >> $DAEMON_PIDS 567 $ cat other.pid >> $DAEMON_PIDS
568 568
569 $ hg -R main push other -r e7ec4e813ba6 569 $ hg -R main push other -r e7ec4e813ba6
570 pushing to other 570 pushing to other
623 Check error from hook during the unbundling process itself 623 Check error from hook during the unbundling process itself
624 624
625 $ cat << EOF >> $HGRCPATH 625 $ cat << EOF >> $HGRCPATH
626 > pretxnchangegroup = sh -c "echo 'Fail early!'; false" 626 > pretxnchangegroup = sh -c "echo 'Fail early!'; false"
627 > EOF 627 > EOF
628 $ killdaemons.py $DAEMON_PIDS # reload http config 628 $ killdaemons.py # reload http config
629 $ hg -R other serve -p $HGPORT2 -d --pid-file=other.pid -E other-error.log 629 $ hg -R other serve -p $HGPORT2 -d --pid-file=other.pid -E other-error.log
630 $ cat other.pid >> $DAEMON_PIDS 630 $ cat other.pid >> $DAEMON_PIDS
631 631
632 $ hg -R main push other -r e7ec4e813ba6 632 $ hg -R main push other -r e7ec4e813ba6
633 pushing to other 633 pushing to other