diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-03-28 13:52:24 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-03-28 13:52:24 -0700 |
| commit | 110bdbddc85350b0f6f5eec223e102ca4b56e24f (patch) | |
| tree | 1184112d8fcd098e6e99b680c3f6b62586902d66 | |
| parent | Merge branch 'js/regexec-buf' into maint (diff) | |
| parent | t7004, t7030: fix here-doc syntax errors (diff) | |
| download | tgif-110bdbddc85350b0f6f5eec223e102ca4b56e24f.tar.xz | |
Merge branch 'st/verify-tag' into maint
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
| -rwxr-xr-x | t/t7004-tag.sh | 12 | ||||
| -rwxr-xr-x | t/t7030-verify-tag.sh | 12 |
2 files changed, 10 insertions, 14 deletions
diff --git a/t/t7004-tag.sh b/t/t7004-tag.sh index 072e6c6b88..b8ad076c25 100755 --- a/t/t7004-tag.sh +++ b/t/t7004-tag.sh @@ -879,18 +879,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 ' diff --git a/t/t7030-verify-tag.sh b/t/t7030-verify-tag.sh index d62ccbb98e..b4b49eeb08 100755 --- a/t/t7030-verify-tag.sh +++ b/t/t7030-verify-tag.sh @@ -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 ' |