On Mon, Jun 27, 2011 at 11:02:22AM -0700, Junio C Hamano wrote: > Some tests try to be too careful about cleaning themselves up and > do > > test_expect_success description ' > set-up some test refs and/or configuration && > test_when_finished "revert the above changes" && > the real test > ' > > Which is nice to make sure that a potential failure would not have > unexpected interaction with the next test. This however interferes when > "the real test" fails and we want to see what is going on, by running the > test with --immediate mode and descending into its trash directory after > the test stops. The precondition to run the real test and cause it to fail > is all gone after the clean-up procedure defined by test_when_finished is > done. > > Update test_run_ which is the workhorse of running a test script > called from test_expect_success and test_expect_failure, so that we do not > run clean-up script defined with test_when_finished when a test that is > expected to succeed fails under the --immediate mode. > > Signed-off-by: Junio C Hamano <gitster@xxxxxxxxx> > --- > > * Likes, dislikes? This sounds to me like the right thing to do. The current behavior has never been a problem for me, but that is probably because test_when_finished is relatively new. If I were to run into this situation, your patch does exactly what I would expect. -Peff -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html