Mercurial > hg > hg-git
changeset 386:525ffe284b0c
tests: use run-tests.py's built-in daemon killing
Makes interrupting a test run more graceful and overall less
frustrating.
author | Augie Fackler <durin42@gmail.com> |
---|---|
date | Sun, 15 May 2011 12:23:53 -0500 |
parents | 154334e1e7e0 |
children | ed28dd69df61 |
files | tests/test-empty-working-tree tests/test-encoding tests/test-file-removal tests/test-git-tags tests/test-hg-author tests/test-hg-branch tests/test-hg-tags tests/test-merge tests/test-octopus tests/test-outgoing tests/test-pull tests/test-pull-after-strip tests/test-push tests/test-sane-without-bookmarks tests/test-tree-decomposition |
diffstat | 15 files changed, 15 insertions(+), 30 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-empty-working-tree +++ b/tests/test-empty-working-tree @@ -42,7 +42,7 @@ git daemon --base-path="$(pwd)"\ --listen=localhost\ --export-all\ - --pid-file=gitdaemon.pid \ + --pid-file="$DAEMON_PIDS" \ --detach --reuseaddr \ --enable=receive-pack @@ -57,4 +57,3 @@ git log --pretty=medium cd .. -kill `cat gitdaemon.pid`
--- a/tests/test-encoding +++ b/tests/test-encoding @@ -53,7 +53,7 @@ git daemon --base-path="$(pwd)"\ --listen=localhost\ --export-all\ - --pid-file=gitdaemon.pid \ + --pid-file="$DAEMON_PIDS" \ --detach --reuseaddr \ --enable=receive-pack @@ -69,4 +69,3 @@ git log --pretty=medium cd .. -kill `cat gitdaemon.pid`
--- a/tests/test-file-removal +++ b/tests/test-file-removal @@ -60,7 +60,7 @@ git daemon --base-path="$(pwd)"\ --listen=localhost\ --export-all\ - --pid-file=gitdaemon.pid \ + --pid-file="$DAEMON_PIDS" \ --detach --reuseaddr \ --enable=receive-pack @@ -83,4 +83,3 @@ git log --pretty=medium cd .. -kill `cat gitdaemon.pid`
--- a/tests/test-git-tags +++ b/tests/test-git-tags @@ -56,7 +56,7 @@ git daemon --base-path="$(pwd)"\ --listen=localhost\ --export-all\ - --pid-file=gitdaemon.pid \ + --pid-file="$DAEMON_PIDS" \ --detach --reuseaddr \ --enable=receive-pack @@ -69,4 +69,3 @@ hg push cd .. -kill `cat gitdaemon.pid`
--- a/tests/test-hg-author +++ b/tests/test-hg-author @@ -57,7 +57,7 @@ git daemon --base-path="$(pwd)"\ --listen=localhost\ --export-all\ - --pid-file=gitdaemon.pid \ + --pid-file="$DAEMON_PIDS" \ --detach --reuseaddr \ --enable=receive-pack @@ -82,4 +82,3 @@ hg log --graph cd .. -kill `cat gitdaemon.pid`
--- a/tests/test-hg-branch +++ b/tests/test-hg-branch @@ -58,7 +58,7 @@ git daemon --base-path="$(pwd)"\ --listen=localhost\ --export-all\ - --pid-file=gitdaemon.pid \ + --pid-file="$DAEMON_PIDS" \ --detach --reuseaddr \ --enable=receive-pack @@ -82,4 +82,3 @@ hg log --graph | $filterhash cd .. -kill `cat gitdaemon.pid`
--- a/tests/test-hg-tags +++ b/tests/test-hg-tags @@ -56,7 +56,7 @@ git daemon --base-path="$(pwd)"\ --listen=localhost\ --export-all\ - --pid-file=gitdaemon.pid \ + --pid-file="$DAEMON_PIDS" \ --detach --reuseaddr \ --enable=receive-pack @@ -83,4 +83,3 @@ cat .hgtags cd .. -kill `cat gitdaemon.pid`
--- a/tests/test-merge +++ b/tests/test-merge @@ -60,7 +60,7 @@ git daemon --base-path="$(pwd)"\ --listen=localhost\ --export-all \ - --pid-file=gitdaemon.pid \ + --pid-file="$DAEMON_PIDS" \ --detach --reuseaddr \ --enable=receive-pack @@ -78,4 +78,3 @@ git log --pretty=medium beta | sed 's/\.\.\.//g' cd .. -kill `cat gitdaemon.pid`
--- a/tests/test-octopus +++ b/tests/test-octopus @@ -65,7 +65,7 @@ git daemon --base-path="$(pwd)"\ --listen=localhost\ --export-all\ - --pid-file=gitdaemon.pid \ + --pid-file="$DAEMON_PIDS" \ --detach --reuseaddr \ --enable=receive-pack @@ -80,4 +80,3 @@ git log --pretty=medium | sed s/\\.\\.\\.//g cd .. -kill `cat gitdaemon.pid`
--- a/tests/test-outgoing +++ b/tests/test-outgoing @@ -49,7 +49,7 @@ git daemon --base-path="$(pwd)"\ --listen=localhost\ --export-all\ - --pid-file=gitdaemon.pid \ + --pid-file="$DAEMON_PIDS" \ --detach --reuseaddr \ --enable=receive-pack @@ -94,4 +94,3 @@ cd .. -kill `cat gitdaemon.pid`
--- a/tests/test-pull +++ b/tests/test-pull @@ -49,7 +49,7 @@ git daemon --base-path="$(pwd)"\ --listen=localhost\ --export-all\ - --pid-file=gitdaemon.pid \ + --pid-file="$DAEMON_PIDS" \ --detach --reuseaddr echo % clone a tag @@ -65,4 +65,3 @@ cd .. -kill `cat gitdaemon.pid`
--- a/tests/test-pull-after-strip +++ b/tests/test-pull-after-strip @@ -64,7 +64,7 @@ git daemon --base-path="$(pwd)"\ --listen=localhost\ --export-all\ - --pid-file=gitdaemon.pid \ + --pid-file="$DAEMON_PIDS" \ --detach --reuseaddr echo % clone a tag @@ -94,4 +94,3 @@ hg log --graph cd .. -kill `cat gitdaemon.pid`
--- a/tests/test-push +++ b/tests/test-push @@ -51,7 +51,7 @@ git daemon --base-path="$(pwd)"\ --listen=localhost\ --export-all\ - --pid-file=gitdaemon.pid \ + --pid-file="$DAEMON_PIDS" \ --detach --reuseaddr \ --enable=receive-pack @@ -106,4 +106,3 @@ hg push -fr master cd .. -kill `cat gitdaemon.pid`
--- a/tests/test-sane-without-bookmarks +++ b/tests/test-sane-without-bookmarks @@ -44,7 +44,7 @@ git daemon --base-path="$(pwd)"\ --listen=localhost\ --export-all\ - --pid-file=gitdaemon.pid \ + --pid-file="$DAEMON_PIDS" \ --detach --reuseaddr hg clone git://localhost/gitrepo hgrepo | grep -v '^updating' @@ -52,4 +52,3 @@ hg log --graph cd .. -kill `cat gitdaemon.pid`
--- a/tests/test-tree-decomposition +++ b/tests/test-tree-decomposition @@ -59,7 +59,7 @@ git daemon --base-path="$(pwd)"\ --listen=localhost\ --export-all\ - --pid-file=gitdaemon.pid \ + --pid-file="$DAEMON_PIDS" \ --detach --reuseaddr \ --enable=receive-pack @@ -74,4 +74,3 @@ git log --pretty=medium cd .. -kill `cat gitdaemon.pid`