Hi all, On Thu, 10 Nov 2016, Junio C Hamano wrote: > Andreas Schwab <schwab@xxxxxxx> writes: > > > Commit 5babb5bdb3 ("t6026-merge-attr: clean up background process at end > > of test case") added a kill command to clean up after the test, but this > > can fail if the sleep command exits before the cleanup is executed. > > Ignore the error from the kill command. > > > > Explicitly check for the existence of the pid file to test that the merge > > driver was actually called. > > > > Signed-off-by: Andreas Schwab <schwab@xxxxxxx> > > --- > > OK. sleep.pid is a reasonable easy-to-access side effect we can > observe to make sure that the sleep-one-second merge driver was > indeed invoked, which was missing from the earlier round. No, this is incorrect. The condition that we need to know applies is that the script is still running, and blocking if the bug reappears. It is not enough to test that the script *started* running. If it exits too early, the problematic condition is never tested, and the test is useless. Ciao, Johannes