mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use test_expect_success for test setups

Browse Source 
Several tests did not use test_expect_success for their setup
commands.  Putting these start commands into the testing framework
means both that errors during setup will be caught quickly and that
non-error text will be suppressed without -v.

Signed-off-by: Brian Gernhardt <brian@gernhardtsoftware.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Brian Gernhardt
2010-03-20 04:29:11 -04:00
committed by Junio C Hamano
parent a673cfede6
commit 4a45f7dd49
5 changed files with 64 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
t/t4103-apply-binary.sh
View File

@ -20,23 +20,25 @@ EOF
cat file1 >file2
cat file1 >file4
git update-index --add --remove file1 file2 file4
git commit -m 'Initial Version' 2>/dev/null
test_expect_success 'setup' "
git update-index --add --remove file1 file2 file4 &&
git commit -m 'Initial Version' 2>/dev/null &&
git checkout -b binary
perl -pe 'y/x/\000/' <file1 >file3
cat file3 >file4
git add file2
perl -pe 'y/\000/v/' <file3 >file1
rm -f file2
git update-index --add --remove file1 file2 file3 file4
git commit -m 'Second Version'
git checkout -b binary &&
perl -pe 'y/x/\000/' <file1 >file3 &&
cat file3 >file4 &&
git add file2 &&
perl -pe 'y/\000/v/' <file3 >file1 &&
rm -f file2 &&
git update-index --add --remove file1 file2 file3 file4 &&
git commit -m 'Second Version' &&
git diff-tree -p master binary >B.diff
git diff-tree -p -C master binary >C.diff
git diff-tree -p master binary >B.diff &&
git diff-tree -p -C master binary >C.diff &&
git diff-tree -p --binary master binary >BF.diff
git diff-tree -p --binary -C master binary >CF.diff
git diff-tree -p --binary master binary >BF.diff &&
git diff-tree -p --binary -C master binary >CF.diff
"
test_expect_success 'stat binary diff -- should not fail.' \
'git checkout master