From 6f6692ae82070adf533db9218bfe9dc8fe4641ce Mon Sep 17 00:00:00 2001 From: Jason Fulghum Date: Wed, 22 Mar 2023 09:34:52 -0700 Subject: [PATCH] Tidying up comment in teardown_common --- integration-tests/bats/helper/common.bash | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/integration-tests/bats/helper/common.bash b/integration-tests/bats/helper/common.bash index fd427db9f0..e65dc228f3 100644 --- a/integration-tests/bats/helper/common.bash +++ b/integration-tests/bats/helper/common.bash @@ -91,10 +91,10 @@ setup_common() { teardown_common() { # rm -rf can fail with a "directory not empty" error in some cases. This seems to be a misleading - # error message and the real error is that a file is still in use, as describe here: - # https://superuser.com/questions/467059/trying-to-delete-directory-with-rm-rf-but-get-message-that-its-not-empty - # We return true from this function so that teardown will never fail the tests, even if it encounters a - # problem cleaning up temporary work dirs. + # error message; the real error is that a file is still in use. Instead of waiting longer for + # any processes to finish, we just ignore any error removing temp files and use 'true' as the last + # command in this function to ensure that teardown_common doesn't fail a test just because we + # couldn't delete any temporary test files. rm -rf "$BATS_TMPDIR/dolt-repo-$$" true }