Mercurial > hg

comparison tests/test-bundle2-exchange.t @ 28549:e01bd7385f4f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: reorder hg serve commands chg currently does not support hg serve -d. It has a quick path testing if the command is hg serve -d and fallbacks to hg if so. But the test only works if "serve" is the first argument since the test wants to avoid false positives (for example, "-r serve" is different). This patch reorders "hg server" commands in tests, making them chg friendly.
author Jun Wu <quark@fb.com>
date Tue, 15 Mar 2016 09:51:54 +0000
parents d6d3cf5fda6f
children 622782ea9cf3 b8f9cdca8807
comparison
equal deleted inserted replaced
28548:b7a31068cc80 28549:e01bd7385f4f
299 3333333333333333333333333333333333333333 eea13746799a9e0bfd88f29d3c2e9dc9389f524f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 299 3333333333333333333333333333333333333333 eea13746799a9e0bfd88f29d3c2e9dc9389f524f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
300 4444444444444444444444444444444444444444 02de42196ebee42ef284b6780a87cdc96e8eaab6 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 300 4444444444444444444444444444444444444444 02de42196ebee42ef284b6780a87cdc96e8eaab6 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
301 301
302 pull over http 302 pull over http
303 303
304 $ hg -R main serve -p $HGPORT -d --pid-file=main.pid -E main-error.log 304 $ hg serve -R main -p $HGPORT -d --pid-file=main.pid -E main-error.log
305 $ cat main.pid >> $DAEMON_PIDS 305 $ cat main.pid >> $DAEMON_PIDS
306 306
307 $ hg -R other pull http://localhost:$HGPORT/ -r 42ccdea3bb16 --bookmark book_42cc 307 $ hg -R other pull http://localhost:$HGPORT/ -r 42ccdea3bb16 --bookmark book_42cc
308 pulling from http://localhost:$HGPORT/ 308 pulling from http://localhost:$HGPORT/
309 searching for changes 309 searching for changes
370 5555555555555555555555555555555555555555 42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 370 5555555555555555555555555555555555555555 42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
371 6666666666666666666666666666666666666666 5fddd98957c8a54a4d436dfe1da9d87f21a1b97b 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 371 6666666666666666666666666666666666666666 5fddd98957c8a54a4d436dfe1da9d87f21a1b97b 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
372 372
373 push over http 373 push over http
374 374
375 $ hg -R other serve -p $HGPORT2 -d --pid-file=other.pid -E other-error.log 375 $ hg serve -R other -p $HGPORT2 -d --pid-file=other.pid -E other-error.log
376 $ cat other.pid >> $DAEMON_PIDS 376 $ cat other.pid >> $DAEMON_PIDS
377 377
378 $ hg -R main phase --public 32af7686d403 378 $ hg -R main phase --public 32af7686d403
379 pre-close-tip:02de42196ebe draft book_02de 379 pre-close-tip:02de42196ebe draft book_02de
380 postclose-tip:02de42196ebe draft book_02de 380 postclose-tip:02de42196ebe draft book_02de
496 > [extensions] 496 > [extensions]
497 > failpush=$TESTTMP/failpush.py 497 > failpush=$TESTTMP/failpush.py
498 > EOF 498 > EOF
499 499
500 $ killdaemons.py 500 $ killdaemons.py
501 $ hg -R other serve -p $HGPORT2 -d --pid-file=other.pid -E other-error.log 501 $ hg serve -R other -p $HGPORT2 -d --pid-file=other.pid -E other-error.log
502 $ cat other.pid >> $DAEMON_PIDS 502 $ cat other.pid >> $DAEMON_PIDS
503 503
504 Doing the actual push: Abort error 504 Doing the actual push: Abort error
505 505
506 $ cat << EOF >> $HGRCPATH 506 $ cat << EOF >> $HGRCPATH
594 > pretxnclose.failpush = sh -c "echo 'You shall not pass!'; false" 594 > pretxnclose.failpush = sh -c "echo 'You shall not pass!'; false"
595 > txnabort.failpush = sh -c "echo 'Cleaning up the mess...'" 595 > txnabort.failpush = sh -c "echo 'Cleaning up the mess...'"
596 > EOF 596 > EOF
597 597
598 $ killdaemons.py 598 $ killdaemons.py
599 $ hg -R other serve -p $HGPORT2 -d --pid-file=other.pid -E other-error.log 599 $ hg serve -R other -p $HGPORT2 -d --pid-file=other.pid -E other-error.log
600 $ cat other.pid >> $DAEMON_PIDS 600 $ cat other.pid >> $DAEMON_PIDS
601 601
602 $ hg -R main push other -r e7ec4e813ba6 602 $ hg -R main push other -r e7ec4e813ba6
603 pushing to other 603 pushing to other
604 searching for changes 604 searching for changes
659 659
660 $ cat << EOF >> $HGRCPATH 660 $ cat << EOF >> $HGRCPATH
661 > pretxnchangegroup = sh -c "echo 'Fail early!'; false" 661 > pretxnchangegroup = sh -c "echo 'Fail early!'; false"
662 > EOF 662 > EOF
663 $ killdaemons.py # reload http config 663 $ killdaemons.py # reload http config
664 $ hg -R other serve -p $HGPORT2 -d --pid-file=other.pid -E other-error.log 664 $ hg serve -R other -p $HGPORT2 -d --pid-file=other.pid -E other-error.log
665 $ cat other.pid >> $DAEMON_PIDS 665 $ cat other.pid >> $DAEMON_PIDS
666 666
667 $ hg -R main push other -r e7ec4e813ba6 667 $ hg -R main push other -r e7ec4e813ba6
668 pushing to other 668 pushing to other
669 searching for changes 669 searching for changes
783 > prepushkey.failpush = sh -c "echo 'do not push the key !'; false" 783 > prepushkey.failpush = sh -c "echo 'do not push the key !'; false"
784 > [extensions] 784 > [extensions]
785 > mandatorypart=$TESTTMP/mandatorypart.py 785 > mandatorypart=$TESTTMP/mandatorypart.py
786 > EOF 786 > EOF
787 $ "$TESTDIR/killdaemons.py" $DAEMON_PIDS # reload http config 787 $ "$TESTDIR/killdaemons.py" $DAEMON_PIDS # reload http config
788 $ hg -R other serve -p $HGPORT2 -d --pid-file=other.pid -E other-error.log 788 $ hg serve -R other -p $HGPORT2 -d --pid-file=other.pid -E other-error.log
789 $ cat other.pid >> $DAEMON_PIDS 789 $ cat other.pid >> $DAEMON_PIDS
790 790
791 (Failure from a hook) 791 (Failure from a hook)
792 792
793 $ hg -R main push other -r e7ec4e813ba6 793 $ hg -R main push other -r e7ec4e813ba6
855 $ cat >> $HGRCPATH << EOF 855 $ cat >> $HGRCPATH << EOF
856 > [hooks] 856 > [hooks]
857 > prepushkey.failpush = 857 > prepushkey.failpush =
858 > EOF 858 > EOF
859 $ "$TESTDIR/killdaemons.py" $DAEMON_PIDS # reload http config 859 $ "$TESTDIR/killdaemons.py" $DAEMON_PIDS # reload http config
860 $ hg -R other serve -p $HGPORT2 -d --pid-file=other.pid -E other-error.log 860 $ hg serve -R other -p $HGPORT2 -d --pid-file=other.pid -E other-error.log
861 $ cat other.pid >> $DAEMON_PIDS 861 $ cat other.pid >> $DAEMON_PIDS
862 862
863 $ hg -R main push other -r e7ec4e813ba6 863 $ hg -R main push other -r e7ec4e813ba6
864 pushing to other 864 pushing to other
865 searching for changes 865 searching for changes