diff options
| author | John Keeping <john@keeping.me.uk> | 2015-09-05 14:12:46 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-09-08 10:34:59 -0700 |
| commit | c545bc6266e36fdb798cf79fd1f7ef9f39791a94 (patch) | |
| tree | c880e97efa592db692d21f6cdab418dfb30ca871 | |
| parent | 1a9a23e35c1ba75187ee600fb7a1f107a2fb1893 (diff) | |
| download | git-c545bc6266e36fdb798cf79fd1f7ef9f39791a94.tar.gz | |
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>
| -rwxr-xr-x | t/t5801-remote-helpers.sh | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/t/t5801-remote-helpers.sh b/t/t5801-remote-helpers.sh index c9d3ed14c3..362b1581e0 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 ) ' |