t5601: rm the target file of cp that could still be executing
"while sh t5601-clone.sh; do :; done" seems to fail sporadically at around test #45 where fake-ssh wrapper is copied create plink.exe, with an error message that says the "text is busy". I have a mild suspicion that the root cause of the bug is that the fake SSH process from the previous test is still running by the time the next test wants to replace it with a new binary, but in the meantime, removing the target that could still be executing before copying something else over seems to work it around. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Oct 17, 2017 at 14:04 UTC
cff48ccf2a4fefab6f87b1b6ec9ec63595d88175
1 file changed
+2
t/t5601-clone.sh
+2
@@ -308,6 +308,7 @@ test_expect_success 'clone checking out a tag' '
308
309
setup_ssh_wrapper () {
310
test_expect_success 'setup ssh wrapper' '
311
+ rm -f "$TRASH_DIRECTORY/ssh-wrapper$X" &&
312
cp "$GIT_BUILD_DIR/t/helper/test-fake-ssh$X" \
313
"$TRASH_DIRECTORY/ssh-wrapper$X" &&
314
GIT_SSH="$TRASH_DIRECTORY/ssh-wrapper$X" &&
@@ -318,6 +319,7 @@ setup_ssh_wrapper () {
319
}
320
321
copy_ssh_wrapper_as () {
322
+ rm -f "${1%$X}$X" &&
323
cp "$TRASH_DIRECTORY/ssh-wrapper$X" "${1%$X}$X" &&
324
GIT_SSH="${1%$X}$X" &&
325
export GIT_SSH