[PATCH 2/5] t5801: don't use test_when_finished in a subshell
- From
John Keeping <john@keeping.me.uk>
- Date
- Sep 5, 2015, 13:12 UTC
- Message-ID
- <41e0d2245954e80135d33acbb616c2a56605759a.1441458341.git.john@keeping.me.uk>
- In-Reply-To
- <cover.1441458341.git.john@keeping.me.uk>
test_when_finished has no effect in a subshell. Since the cmp_marks function is only used once, inline it at its call site and move the test_when_finished invocation to the start of the test.
Signed-off-by: John Keeping <john@keeping.me.uk> --- t/t5801-remote-helpers.sh | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/t/t5801-remote-helpers.sh b/t/t5801-remote-helpers.sh index c9d3ed1..362b158 100755 --- a/t/t5801-remote-helpers.sh +++ b/t/t5801-remote-helpers.sh @@ -242,13 +242,6 @@ clean_mark () { sort >$(basename "$1") } -cmp_marks () { - test_when_finished "rm -rf git.marks testgit.marks" && - clean_mark ".git/testgit/$1/git.marks" && - clean_mark ".git/testgit/$1/testgit.marks" && - test_cmp git.marks testgit.marks -} - test_expect_success 'proper failure checks for fetching' ' (cd local && test_must_fail env GIT_REMOTE_TESTGIT_FAILURE=1 git fetch 2>error && @@ -258,12 +251,15 @@ test_expect_success 'proper failure checks for fetching' ' ' test_expect_success 'proper failure checks for pushing' ' + test_when_finished "rm -rf local/git.marks local/testgit.marks" && (cd local && git checkout -b crash master && echo crash >>file && git commit -a -m crash && test_must_fail env GIT_REMOTE_TESTGIT_FAILURE=1 git push --all && - cmp_marks origin + clean_mark ".git/testgit/origin/git.marks" && + clean_mark ".git/testgit/origin/testgit.marks" && + test_cmp git.marks testgit.marks ) '
-- 2.5.0.466.g9af26fa