--- a/tests/test-bad-pull.t Sun Apr 01 15:57:04 2012 -0500
+++ b/tests/test-bad-pull.t Mon Apr 02 16:09:29 2012 -0500
@@ -25,6 +25,3 @@
abort: HTTP Error 404: * (glob)
[255]
$ wait $P
- $ cat log
- localhost - - [*] code 404, message File not found (glob)
- localhost - - [*] "GET /foo?cmd=capabilities HTTP/1.1" 404 - (glob)
--- a/tests/test-hup.t Sun Apr 01 15:57:04 2012 -0500
+++ b/tests/test-hup.t Mon Apr 02 16:09:29 2012 -0500
@@ -3,7 +3,7 @@
$ "$TESTDIR/hghave" serve fifo || exit 80
$ hg init
$ mkfifo p
- $ hg serve --stdio < p &
+ $ hg serve --stdio < p 1>out 2>&1 &
$ P=$!
Do test while holding fifo open
@@ -11,10 +11,12 @@
$ (
> echo lock
> echo addchangegroup
- > while [ ! -e .hg/store/00changelog.i.a ]; do true; done
+ > while [ ! -s .hg/store/journal ]; do true; done
> kill -HUP $P
- > while kill -0 $P 2>/dev/null; do true; done
> ) > p
+
+ $ while kill -0 $P 2>/dev/null; do true; done
+ $ cat out
0
0
adding changesets