tests: make test-hup more race-proof
We need to wait until a journal exists AND is non-empty before
aborting a transaction to get stable output. We move the kill wait
outside the fifo block to avoid potential deadlock.
--- a/tests/test-hup.t Mon Apr 02 15:06:36 2012 -0500
+++ b/tests/test-hup.t Mon Apr 02 16:04:07 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