mirror of
https://github.com/git/git.git
synced 2025-03-27 16:58:05 +00:00
t5801: don't use test_when_finished in a subshell
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> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
1a9a23e35c
commit
c545bc6266
@ -242,13 +242,6 @@ clean_mark () {
|
|||||||
sort >$(basename "$1")
|
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' '
|
test_expect_success 'proper failure checks for fetching' '
|
||||||
(cd local &&
|
(cd local &&
|
||||||
test_must_fail env GIT_REMOTE_TESTGIT_FAILURE=1 git fetch 2>error &&
|
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_expect_success 'proper failure checks for pushing' '
|
||||||
|
test_when_finished "rm -rf local/git.marks local/testgit.marks" &&
|
||||||
(cd local &&
|
(cd local &&
|
||||||
git checkout -b crash master &&
|
git checkout -b crash master &&
|
||||||
echo crash >>file &&
|
echo crash >>file &&
|
||||||
git commit -a -m crash &&
|
git commit -a -m crash &&
|
||||||
test_must_fail env GIT_REMOTE_TESTGIT_FAILURE=1 git push --all &&
|
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
|
||||||
)
|
)
|
||||||
'
|
'
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user