undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

modernize t9300: use test_when_finished for clean-up

Browse Source 
A number of clean-ups of test cases are performed outside of
test_expect_success. Replace these cases by using test_when_finished.

Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Jeff King <peff@peff.net>
This commit is contained in:
Johannes Sixt 2015-11-19 20:09:47 +01:00 committed by Jeff King
parent ec2c10bef8
commit 93e911f5ae
1 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
t/t9300-fast-import.sh
View File

@ -344,9 +344,9 @@ M 755 0000000000000000000000000000000000000001 zero1
INPUT_END INPUT_END
test_expect_success 'B: fail on invalid blob sha1' ' test_expect_success 'B: fail on invalid blob sha1' '
test_when_finished "rm -f .git/objects/pack_* .git/objects/index_*" &&
test_must_fail git fast-import <input test_must_fail git fast-import <input
' '
rm -f .git/objects/pack_* .git/objects/index_*
cat >input <<INPUT_END cat >input <<INPUT_END
commit TEMP_TAG commit TEMP_TAG
@ -359,14 +359,13 @@ from refs/heads/master
INPUT_END INPUT_END
test_expect_success 'B: accept branch name "TEMP_TAG"' ' test_expect_success 'B: accept branch name "TEMP_TAG"' '
test_when_finished "rm -f .git/TEMP_TAG
git gc
git prune" &&
git fast-import <input && git fast-import <input &&
test -f .git/TEMP_TAG && test -f .git/TEMP_TAG &&
test `git rev-parse master` = `git rev-parse TEMP_TAG^` test `git rev-parse master` = `git rev-parse TEMP_TAG^`
' '
rm -f .git/TEMP_TAG
git gc 2>/dev/null >/dev/null
git prune 2>/dev/null >/dev/null
cat >input <<INPUT_END cat >input <<INPUT_END
commit refs/heads/empty-committer-1 commit refs/heads/empty-committer-1
@ -376,15 +375,14 @@ empty commit
COMMIT COMMIT
INPUT_END INPUT_END
test_expect_success 'B: accept empty committer' ' test_expect_success 'B: accept empty committer' '
test_when_finished "git update-ref -d refs/heads/empty-committer-1
git gc
git prune" &&
git fast-import <input && git fast-import <input &&
out=$(git fsck) && out=$(git fsck) &&
echo "$out" && echo "$out" &&
test -z "$out" test -z "$out"
' '
git update-ref -d refs/heads/empty-committer-1 || true
git gc 2>/dev/null >/dev/null
git prune 2>/dev/null >/dev/null
cat >input <<INPUT_END cat >input <<INPUT_END
commit refs/heads/empty-committer-2 commit refs/heads/empty-committer-2
@ -394,15 +392,14 @@ empty commit
COMMIT COMMIT
INPUT_END INPUT_END
test_expect_success 'B: accept and fixup committer with no name' ' test_expect_success 'B: accept and fixup committer with no name' '
test_when_finished "git update-ref -d refs/heads/empty-committer-2
git gc
git prune" &&
git fast-import <input && git fast-import <input &&
out=$(git fsck) && out=$(git fsck) &&
echo "$out" && echo "$out" &&
test -z "$out" test -z "$out"
' '
git update-ref -d refs/heads/empty-committer-2 || true
git gc 2>/dev/null >/dev/null
git prune 2>/dev/null >/dev/null
cat >input <<INPUT_END cat >input <<INPUT_END
commit refs/heads/invalid-committer commit refs/heads/invalid-committer
@ -412,9 +409,9 @@ empty commit
COMMIT COMMIT
INPUT_END INPUT_END
test_expect_success 'B: fail on invalid committer (1)' ' test_expect_success 'B: fail on invalid committer (1)' '
test_when_finished "git update-ref -d refs/heads/invalid-committer" &&
test_must_fail git fast-import <input test_must_fail git fast-import <input
' '
git update-ref -d refs/heads/invalid-committer || true
cat >input <<INPUT_END cat >input <<INPUT_END
commit refs/heads/invalid-committer commit refs/heads/invalid-committer
@ -424,9 +421,9 @@ empty commit
COMMIT COMMIT
INPUT_END INPUT_END
test_expect_success 'B: fail on invalid committer (2)' ' test_expect_success 'B: fail on invalid committer (2)' '
test_when_finished "git update-ref -d refs/heads/invalid-committer" &&
test_must_fail git fast-import <input test_must_fail git fast-import <input
' '
git update-ref -d refs/heads/invalid-committer || true
cat >input <<INPUT_END cat >input <<INPUT_END
commit refs/heads/invalid-committer commit refs/heads/invalid-committer
@ -436,9 +433,9 @@ empty commit
COMMIT COMMIT
INPUT_END INPUT_END
test_expect_success 'B: fail on invalid committer (3)' ' test_expect_success 'B: fail on invalid committer (3)' '
test_when_finished "git update-ref -d refs/heads/invalid-committer" &&
test_must_fail git fast-import <input test_must_fail git fast-import <input
' '
git update-ref -d refs/heads/invalid-committer || true
cat >input <<INPUT_END cat >input <<INPUT_END
commit refs/heads/invalid-committer commit refs/heads/invalid-committer
@ -448,9 +445,9 @@ empty commit
COMMIT COMMIT
INPUT_END INPUT_END
test_expect_success 'B: fail on invalid committer (4)' ' test_expect_success 'B: fail on invalid committer (4)' '
test_when_finished "git update-ref -d refs/heads/invalid-committer" &&
test_must_fail git fast-import <input test_must_fail git fast-import <input
' '
git update-ref -d refs/heads/invalid-committer || true
cat >input <<INPUT_END cat >input <<INPUT_END
commit refs/heads/invalid-committer commit refs/heads/invalid-committer
@ -460,9 +457,9 @@ empty commit
COMMIT COMMIT
INPUT_END INPUT_END
test_expect_success 'B: fail on invalid committer (5)' ' test_expect_success 'B: fail on invalid committer (5)' '
test_when_finished "git update-ref -d refs/heads/invalid-committer" &&
test_must_fail git fast-import <input test_must_fail git fast-import <input
' '
git update-ref -d refs/heads/invalid-committer || true
### ###
### series C ### series C
@ -914,6 +911,7 @@ g/b/h
EOF EOF
test_expect_success 'L: nested tree copy does not corrupt deltas' ' test_expect_success 'L: nested tree copy does not corrupt deltas' '
test_when_finished "git update-ref -d refs/heads/L2" &&
git fast-import <input && git fast-import <input &&
git ls-tree L2 g/b/ >tmp && git ls-tree L2 g/b/ >tmp &&
cat tmp | cut -f 2 >actual && cat tmp | cut -f 2 >actual &&
@ -921,8 +919,6 @@ test_expect_success 'L: nested tree copy does not corrupt deltas' '
git fsck `git rev-parse L2` git fsck `git rev-parse L2`
' '
git update-ref -d refs/heads/L2
### ###
### series M ### series M
### ###