From: Jiang Xin <worldhello.net@gmail.com>
To: Git List <git@vger.kernel.org>, Junio C Hamano <gitster@pobox.com>
Cc: Jiang Xin <zhiyou.jx@alibaba-inc.com>,
Jiang Xin <worldhello.net@gmail.com>
Subject: [PATCH v2 2/3] t1301: use test_when_finished for cleanup
Date: Mon, 28 Nov 2022 21:03:22 +0800 [thread overview]
Message-ID: <20221128130323.8914-3-worldhello.net@gmail.com> (raw)
In-Reply-To: <20221127145130.16155-1-worldhello.net@gmail.com>
From: Jiang Xin <zhiyou.jx@alibaba-inc.com>
Refactor several test cases to use "test_when_finished" for cleanup.
1. For first of these, we used to clean-up outside the test, but instead
let's use test_when_finished for that.
2. For the second, we used to leave "new" after we are done, but not use
it at all later. Now we do clean up.
3. For the rest, these child.git test repositories used to follow
"initialize what we are going to use to a known state before we use"
pattern, which is not wrong per-se, but now we use "clean up the
cruft we made after we are done" pattern, which may arguably be
better simply because the test that makes cruft should know what
cruft it created better than whatever comes later that may not know.
Helped-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Jiang Xin <zhiyou.jx@alibaba-inc.com>
---
t/t1301-shared-repo.sh | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/t/t1301-shared-repo.sh b/t/t1301-shared-repo.sh
index 7578e75d77..1225abbb6d 100755
--- a/t/t1301-shared-repo.sh
+++ b/t/t1301-shared-repo.sh
@@ -25,6 +25,7 @@ test_expect_success 'shared = 0400 (faulty permission u-w)' '
for u in 002 022
do
test_expect_success POSIXPERM "shared=1 does not clear bits preset by umask $u" '
+ test_when_finished "rm -rf sub" &&
mkdir sub && (
cd sub &&
umask $u &&
@@ -42,7 +43,6 @@ do
;;
esac
'
- rm -rf sub
done
test_expect_success 'shared=all' '
@@ -132,6 +132,7 @@ test_expect_success POSIXPERM 'git reflog expire honors core.sharedRepository' '
'
test_expect_success POSIXPERM 'forced modes' '
+ test_when_finished "rm -rf new" &&
mkdir -p templates/hooks &&
echo update-server-info >templates/hooks/post-update &&
chmod +x templates/hooks/post-update &&
@@ -174,6 +175,7 @@ test_expect_success POSIXPERM 'forced modes' '
'
test_expect_success POSIXPERM 'remote init does not use config from cwd' '
+ test_when_finished "rm -rf child.git" &&
git config core.sharedrepository 0666 &&
umask 0022 &&
git init --bare child.git &&
@@ -193,7 +195,7 @@ test_expect_success POSIXPERM 're-init respects core.sharedrepository (local)' '
'
test_expect_success POSIXPERM 're-init respects core.sharedrepository (remote)' '
- rm -rf child.git &&
+ test_when_finished "rm -rf child.git" &&
umask 0022 &&
git init --bare --shared=0666 child.git &&
test_path_is_missing child.git/foo &&
@@ -204,7 +206,7 @@ test_expect_success POSIXPERM 're-init respects core.sharedrepository (remote)'
'
test_expect_success POSIXPERM 'template can set core.sharedrepository' '
- rm -rf child.git &&
+ test_when_finished "rm -rf child.git" &&
umask 0022 &&
git config core.sharedrepository 0666 &&
cp .git/config templates/config &&
--
2.39.0.rc0
next prev parent reply other threads:[~2022-11-28 13:03 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-27 14:51 [PATCH v1 1/4] t1301: fix wrong template dir for git-init Jiang Xin
2022-11-27 14:51 ` [PATCH v1 2/4] t1301: use test_when_finished for cleanup Jiang Xin
2022-11-28 4:11 ` Junio C Hamano
2022-11-27 14:51 ` [PATCH v1 3/4] t1301: wrap the statements in the for loop Jiang Xin
2022-11-28 4:18 ` Junio C Hamano
2022-11-28 9:43 ` Jiang Xin
2022-11-28 11:56 ` Jiang Xin
2022-11-27 14:51 ` [PATCH v1 4/4] t1301: do not change $CWD in "shared=all" test case Jiang Xin
2022-11-28 4:41 ` Junio C Hamano
2022-11-28 9:46 ` Jiang Xin
2022-11-28 13:03 ` [PATCH v2 0/3] t1301: various updates Jiang Xin
2022-11-29 13:15 ` [PATCH v3 " Jiang Xin
2022-11-29 13:15 ` [PATCH v3 1/3] t1301: fix wrong template dir for git-init Jiang Xin
2022-11-29 13:15 ` [PATCH v3 2/3] t1301: use test_when_finished for cleanup Jiang Xin
2022-11-29 13:15 ` [PATCH v3 3/3] t1301: do not change $CWD in "shared=all" test case Jiang Xin
2022-11-28 13:03 ` [PATCH v2 1/3] t1301: fix wrong template dir for git-init Jiang Xin
2022-11-28 13:24 ` Ævar Arnfjörð Bjarmason
2022-11-28 14:12 ` Jiang Xin
2022-11-28 14:21 ` Ævar Arnfjörð Bjarmason
2022-11-28 13:03 ` Jiang Xin [this message]
2022-11-28 13:03 ` [PATCH v2 3/3] t1301: do not change $CWD in "shared=all" test case Jiang Xin
2022-11-28 13:18 ` Ævar Arnfjörð Bjarmason
2022-11-28 14:29 ` Jiang Xin
2022-11-29 0:30 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221128130323.8914-3-worldhello.net@gmail.com \
--to=worldhello.net@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=zhiyou.jx@alibaba-inc.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).