tests: add timeouts, make run-tests.py clean up dead daemon processes test timeout feature is needed for test with python 2.5 beta. if test does not complete in time (30 seconds is default), it is killed. some times daemon process used in test can be alive after the test is killed by user or by timeout. tests now record daemon pids into $DAEMON_PIDS and run-tests.py kills all living daemons after every test. final little change is to add newline to end of pid file printed by "hg serve", else "cat hg.pid >> $DAEMON_FILES" gives garbage.

     1

#!/bin/sh

     2

     3

hg init

     4

echo "nothing" > a

     5

hg add a

     6

hg commit -m ancestor -d "1000000 0"

     7

echo "something" > a

     8

hg commit -m branch1 -d "1000000 0"

     9

hg co 0

    10

echo "something else" > a

    11

hg commit -m branch2 -d "1000000 0"

    12

HGMERGE=merge; export HGMERGE

    13

hg merge 1

    14

hg id

    15

egrep -v ">>>|<<<" a

    16

hg status