Mercurial > hg
comparison tests/test-hgwebdir.t @ 17466:d5a3bda6e170
killdaemons: take file argument explicitely
It makes it easier to use as a generic replacement for kill utility,
mostly for Windows tests.
author | Patrick Mezard <patrick@mezard.eu> |
---|---|
date | Mon, 20 Aug 2012 22:36:51 +0200 |
parents | 953faba28e91 |
children | 2efc6536ea43 |
comparison
equal
deleted
inserted
replaced
17465:2d4a096e213c | 17466:d5a3bda6e170 |
---|---|
655 | 655 |
656 d | 656 d |
657 | 657 |
658 Test collapse = True | 658 Test collapse = True |
659 | 659 |
660 $ "$TESTDIR/killdaemons.py" | 660 $ "$TESTDIR/killdaemons.py" $DAEMON_PIDS |
661 $ cat >> paths.conf <<EOF | 661 $ cat >> paths.conf <<EOF |
662 > [web] | 662 > [web] |
663 > collapse=true | 663 > collapse=true |
664 > EOF | 664 > EOF |
665 $ hg serve -p $HGPORT1 -d --pid-file=hg.pid --webdir-conf paths.conf \ | 665 $ hg serve -p $HGPORT1 -d --pid-file=hg.pid --webdir-conf paths.conf \ |
721 | 721 |
722 f2 | 722 f2 |
723 | 723 |
724 Test descend = False | 724 Test descend = False |
725 | 725 |
726 $ "$TESTDIR/killdaemons.py" | 726 $ "$TESTDIR/killdaemons.py" $DAEMON_PIDS |
727 $ cat >> paths.conf <<EOF | 727 $ cat >> paths.conf <<EOF |
728 > descend=false | 728 > descend=false |
729 > EOF | 729 > EOF |
730 $ hg serve -p $HGPORT1 -d --pid-file=hg.pid --webdir-conf paths.conf \ | 730 $ hg serve -p $HGPORT1 -d --pid-file=hg.pid --webdir-conf paths.conf \ |
731 > -A access-paths.log -E error-paths-4.log | 731 > -A access-paths.log -E error-paths-4.log |
782 Test [paths] '*' in a repo root | 782 Test [paths] '*' in a repo root |
783 | 783 |
784 $ hg id http://localhost:$HGPORT1/astar | 784 $ hg id http://localhost:$HGPORT1/astar |
785 8580ff50825a | 785 8580ff50825a |
786 | 786 |
787 $ "$TESTDIR/killdaemons.py" | 787 $ "$TESTDIR/killdaemons.py" $DAEMON_PIDS |
788 $ cat > paths.conf <<EOF | 788 $ cat > paths.conf <<EOF |
789 > [paths] | 789 > [paths] |
790 > t/a = $root/a | 790 > t/a = $root/a |
791 > t/b = $root/b | 791 > t/b = $root/b |
792 > c = $root/c | 792 > c = $root/c |
810 /t/b/ | 810 /t/b/ |
811 | 811 |
812 | 812 |
813 Test collapse = True | 813 Test collapse = True |
814 | 814 |
815 $ "$TESTDIR/killdaemons.py" | 815 $ "$TESTDIR/killdaemons.py" $DAEMON_PIDS |
816 $ cat >> paths.conf <<EOF | 816 $ cat >> paths.conf <<EOF |
817 > [web] | 817 > [web] |
818 > collapse=true | 818 > collapse=true |
819 > EOF | 819 > EOF |
820 $ hg serve -p $HGPORT1 -d --pid-file=hg.pid --webdir-conf paths.conf \ | 820 $ hg serve -p $HGPORT1 -d --pid-file=hg.pid --webdir-conf paths.conf \ |
835 /t/b/ | 835 /t/b/ |
836 | 836 |
837 | 837 |
838 test descend = False | 838 test descend = False |
839 | 839 |
840 $ "$TESTDIR/killdaemons.py" | 840 $ "$TESTDIR/killdaemons.py" $DAEMON_PIDS |
841 $ cat >> paths.conf <<EOF | 841 $ cat >> paths.conf <<EOF |
842 > descend=false | 842 > descend=false |
843 > EOF | 843 > EOF |
844 $ hg serve -p $HGPORT1 -d --pid-file=hg.pid --webdir-conf paths.conf \ | 844 $ hg serve -p $HGPORT1 -d --pid-file=hg.pid --webdir-conf paths.conf \ |
845 > -A access-paths.log -E error-paths-7.log | 845 > -A access-paths.log -E error-paths-7.log |
855 | 855 |
856 | 856 |
857 /t/a/ | 857 /t/a/ |
858 /t/b/ | 858 /t/b/ |
859 | 859 |
860 $ "$TESTDIR/killdaemons.py" | 860 $ "$TESTDIR/killdaemons.py" $DAEMON_PIDS |
861 $ cat > paths.conf <<EOF | 861 $ cat > paths.conf <<EOF |
862 > [paths] | 862 > [paths] |
863 > nostore = $root/nostore | 863 > nostore = $root/nostore |
864 > inexistent = $root/inexistent | 864 > inexistent = $root/inexistent |
865 > EOF | 865 > EOF |
954 | 954 |
955 rss-log with basedir / | 955 rss-log with basedir / |
956 | 956 |
957 $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT2 'a/rss-log' | grep '<guid' | 957 $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT2 'a/rss-log' | grep '<guid' |
958 <guid isPermaLink="true">http://hg.example.com:8080/a/rev/8580ff50825a</guid> | 958 <guid isPermaLink="true">http://hg.example.com:8080/a/rev/8580ff50825a</guid> |
959 $ "$TESTDIR/killdaemons.py" | 959 $ "$TESTDIR/killdaemons.py" $DAEMON_PIDS |
960 $ hg serve --config web.baseurl=http://hg.example.com:8080/foo/ -p $HGPORT2 -d \ | 960 $ hg serve --config web.baseurl=http://hg.example.com:8080/foo/ -p $HGPORT2 -d \ |
961 > --pid-file=hg.pid --webdir-conf collections.conf \ | 961 > --pid-file=hg.pid --webdir-conf collections.conf \ |
962 > -A access-collections-2.log -E error-collections-2.log | 962 > -A access-collections-2.log -E error-collections-2.log |
963 $ cat hg.pid >> $DAEMON_PIDS | 963 $ cat hg.pid >> $DAEMON_PIDS |
964 | 964 |