t/: Use "test_must_fail git" instead of "! git"
This patch changes every occurrence of "! git" -- with the meaning that a git call has to gracefully fail -- into "test_must_fail git". This is useful to - make sure the test does not fail because of a signal, e.g. SIGSEGV, and - advertise the use of "test_must_fail" for new tests. Signed-off-by: Stephan Beyer <s-beyer@gmx.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
committed by
Junio C Hamano
parent
5a26973025
commit
d492b31caf
@ -27,7 +27,7 @@ test_expect_success 'commit change from svn side' '
|
||||
test_expect_success 'commit conflicting change from git' '
|
||||
echo second line from git >> file &&
|
||||
git commit -a -m "second line from git" &&
|
||||
! git-svn commit-diff -r1 HEAD~1 HEAD "$svnrepo"
|
||||
test_must_fail git-svn commit-diff -r1 HEAD~1 HEAD "$svnrepo"
|
||||
'
|
||||
|
||||
test_expect_success 'commit complementing change from git' '
|
||||
@ -52,7 +52,7 @@ test_expect_success 'dcommit fails to commit because of conflict' '
|
||||
rm -rf t.svn &&
|
||||
echo "fourth line from git" >> file &&
|
||||
git commit -a -m "fourth line from git" &&
|
||||
! git-svn dcommit
|
||||
test_must_fail git-svn dcommit
|
||||
'
|
||||
|
||||
test_expect_success 'dcommit does the svn equivalent of an index merge' "
|
||||
@ -83,7 +83,7 @@ test_expect_success 'multiple dcommit from git-svn will not clobber svn' "
|
||||
git commit -a -m 'new file' &&
|
||||
echo clobber > file &&
|
||||
git commit -a -m 'clobber' &&
|
||||
! git svn dcommit
|
||||
test_must_fail git svn dcommit
|
||||
"
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user