mercurial-crew-with-dirclash: tests/test-merge2.out@83cfd95eafb5 (annotated)

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.

2175 b2ae81a7df29 Make hg update more verbose by default (issue12) Thomas Arendsen Hein <thomas@intevation.de> parents: 925 diff changeset	1	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
b2ae81a7df29 Make hg update more verbose by default (issue12) Thomas Arendsen Hein <thomas@intevation.de> parents: 925 diff changeset	2	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
767 61ed30e82b27 Update tests to match new addremove chattiness. Bryan O'Sullivan <bos@serpentine.com> parents: 749 diff changeset	3	adding b
2175 b2ae81a7df29 Make hg update more verbose by default (issue12) Thomas Arendsen Hein <thomas@intevation.de> parents: 925 diff changeset	4	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
767 61ed30e82b27 Update tests to match new addremove chattiness. Bryan O'Sullivan <bos@serpentine.com> parents: 749 diff changeset	5	adding b

author	Vadim Gelfer <vadim.gelfer@gmail.com>
	Thu, 06 Jul 2006 11:45:34 -0700
changeset 2570	83cfd95eafb5
parent 2175	b2ae81a7df29
permissions	-rw-r--r--