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

t0004 (unwritable files): simplify error handling

Browse Source 
Instead of

	... normal test script ...
	status=$?
	... cleanup ...
	(exit $status)

set up cleanup commands with test_when_finished.  This makes the
test script a little shorter, and more importantly, it ensures errors
during cleanup are reported.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jonathan Nieder 2010-09-06 20:50:17 -05:00 committed by Junio C Hamano
parent e14712c9e6
commit dbda967684
1 changed files with 14 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
t/t0004-unwritable.sh
View File

@ -16,53 +16,29 @@ test_expect_success setup '
' '
test_expect_success POSIXPERM,SANITY 'write-tree should notice unwritable repository' ' test_expect_success POSIXPERM,SANITY 'write-tree should notice unwritable repository' '
test_when_finished "chmod 775 .git/objects .git/objects/??" &&
(
chmod a-w .git/objects .git/objects/?? && chmod a-w .git/objects .git/objects/?? &&
test_must_fail git write-tree test_must_fail git write-tree
)
status=$?
chmod 775 .git/objects .git/objects/??
(exit $status)
' '
test_expect_success POSIXPERM,SANITY 'commit should notice unwritable repository' ' test_expect_success POSIXPERM,SANITY 'commit should notice unwritable repository' '
test_when_finished "chmod 775 .git/objects .git/objects/??" &&
(
chmod a-w .git/objects .git/objects/?? && chmod a-w .git/objects .git/objects/?? &&
test_must_fail git commit -m second test_must_fail git commit -m second
)
status=$?
chmod 775 .git/objects .git/objects/??
(exit $status)
' '
test_expect_success POSIXPERM,SANITY 'update-index should notice unwritable repository' ' test_expect_success POSIXPERM,SANITY 'update-index should notice unwritable repository' '
test_when_finished "chmod 775 .git/objects .git/objects/??" &&
(
echo 6O >file && echo 6O >file &&
chmod a-w .git/objects .git/objects/?? && chmod a-w .git/objects .git/objects/?? &&
test_must_fail git update-index file test_must_fail git update-index file
)
status=$?
chmod 775 .git/objects .git/objects/??
(exit $status)
' '
test_expect_success POSIXPERM,SANITY 'add should notice unwritable repository' ' test_expect_success POSIXPERM,SANITY 'add should notice unwritable repository' '
test_when_finished "chmod 775 .git/objects .git/objects/??" &&
(
echo b >file && echo b >file &&
chmod a-w .git/objects .git/objects/?? && chmod a-w .git/objects .git/objects/?? &&
test_must_fail git add file test_must_fail git add file
)
status=$?
chmod 775 .git/objects .git/objects/??
(exit $status)
' '
test_done test_done