development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-07-16 10:38:05 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Merge branch 'st/verify-tag'

Browse source 
A few unterminated here documents in tests were fixed, which in
turn revealed incorrect expectations the tests make. These tests
have been updated.

* st/verify-tag:
  t7004, t7030: fix here-doc syntax errors
This commit is contained in:
Junio C Hamano 2017-03-27 10:59:22 -07:00
parent 980ee77638 b42ca35e5c
commit c473af7396
2 changed files with 10 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
t/t7004-tag.sh
View file

@ -895,18 +895,16 @@ test_expect_success GPG 'verifying a forged tag should fail' '
test_must_fail git tag -v forged-tag
'
test_expect_success 'verifying a proper tag with --format pass and format accordingly' '
cat >expect <<-\EOF
test_expect_success GPG 'verifying a proper tag with --format pass and format accordingly' '
cat >expect <<-\EOF &&
tagname : signed-tag
EOF &&
EOF
git tag -v --format="tagname : %(tag)" "signed-tag" >actual &&
test_cmp expect actual
'
test_expect_success 'verifying a forged tag with --format fail and format accordingly' '
cat >expect <<-\EOF
tagname : forged-tag
EOF &&
test_expect_success GPG 'verifying a forged tag with --format should fail silently' '
>expect &&
test_must_fail git tag -v --format="tagname : %(tag)" "forged-tag" >actual &&
test_cmp expect actual
'

12
t/t7030-verify-tag.sh
View file

@ -125,18 +125,16 @@ test_expect_success GPG 'verify multiple tags' '
test_cmp expect.stderr actual.stderr
'
test_expect_success 'verifying tag with --format' '
cat >expect <<-\EOF
test_expect_success GPG 'verifying tag with --format' '
cat >expect <<-\EOF &&
tagname : fourth-signed
EOF &&
EOF
git verify-tag --format="tagname : %(tag)" "fourth-signed" >actual &&
test_cmp expect actual
'
test_expect_success 'verifying a forged tag with --format fail and format accordingly' '
cat >expect <<-\EOF
tagname : 7th forged-signed
EOF &&
test_expect_success GPG 'verifying a forged tag with --format should fail silently' '
>expect &&
test_must_fail git verify-tag --format="tagname : %(tag)" $(cat forged1.tag) >actual-forged &&
test_cmp expect actual-forged
'