[PATCH 20/21] git-mktag tests: Expand on mktag selftests according to the new tag object structure
From: Johan Herland <hidden>
Date: 2016-06-15 22:43:14
Subsystem:
the rest · Maintainer:
Linus Torvalds
Some more tests are added to test the new "keywords" header, and to test the more thorough verification routine. Signed-off-by: Johan Herland <redacted> --- t/t3800-mktag.sh | 212 ++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 200 insertions(+), 12 deletions(-)
diff --git a/t/t3800-mktag.sh b/t/t3800-mktag.sh
index 3381239..b3b3121 100755
--- a/t/t3800-mktag.sh
+++ b/t/t3800-mktag.sh@@ -46,6 +46,8 @@ cat >tag.sig <<EOF xxxxxx 139e9b33986b1c2670fff52c5067603117b3e895 type tag tag mytag +tagger foo + EOF cat >expect.pat <<EOF
@@ -61,6 +63,8 @@ cat >tag.sig <<EOF object zz9e9b33986b1c2670fff52c5067603117b3e895 type tag tag mytag +tagger foo + EOF cat >expect.pat <<EOF
@@ -76,6 +80,8 @@ cat >tag.sig <<EOF object 779e9b33986b1c2670fff52c5067603117b3e895 xxxx tag tag mytag +tagger foo + EOF cat >expect.pat <<EOF
@@ -103,6 +109,8 @@ cat >tag.sig <<EOF object 779e9b33986b1c2670fff52c5067603117b3e895 type tag xxx mytag +tagger foo + EOF cat >expect.pat <<EOF
@@ -118,6 +126,9 @@ cat >tag.sig <<EOF object 779e9b33986b1c2670fff52c5067603117b3e895 type taggggggggggggggggggggggggggggggg tag +keywords foo +tagger bar@baz.com + EOF cat >expect.pat <<EOF
@@ -127,13 +138,15 @@ EOF check_verify_failure '"tag" line label check #2' ############################################################ -# 8. type line type-name length check +# 8. type line type name length check cat >tag.sig <<EOF object 779e9b33986b1c2670fff52c5067603117b3e895 type taggggggggggggggggggggggggggggggg tag mytag -tagger a +keywords foo +tagger bar@baz.com + EOF cat >expect.pat <<EOF
@@ -149,7 +162,9 @@ cat >tag.sig <<EOF object 779e9b33986b1c2670fff52c5067603117b3e895 type tagggg tag mytag -tagger a +keywords foo +tagger bar@baz.com + EOF cat >expect.pat <<EOF
@@ -159,13 +174,15 @@ EOF check_verify_failure 'verify object (SHA1/type) check' ############################################################ -# 10. verify tag-name check +# 10. verify tag name check cat >tag.sig <<EOF object $head type commit tag my tag -tagger a +keywords foo +tagger bar@baz.com + EOF cat >expect.pat <<EOF
@@ -175,28 +192,120 @@ EOF check_verify_failure 'verify tag-name check' ############################################################ -# 11. tagger line label check #1 +# 11. keywords line label check #1 cat >tag.sig <<EOF object $head type commit tag mytag +xxxxxxxx foo +tagger bar@baz.com + EOF cat >expect.pat <<EOF -^error: .*char 70.*Could not find "tagger ".*$ +^error: .*char 70.*$ +EOF + +check_verify_failure '"keywords" line label check #1' + +############################################################ +# 12. keywords line label check #2 + +cat >tag.sig <<EOF +object $head +type commit +tag mytag +keywords +tagger bar@baz.com + +EOF + +cat >expect.pat <<EOF +^error: .*char 70.*$ +EOF + +check_verify_failure '"keywords" line label check #2' + +############################################################ +# 13. keywords line check #1 + +cat >tag.sig <<EOF +object $head +type commit +tag mytag +keywords foo bar baz +tagger bar@baz.com + +EOF + +cat >expect.pat <<EOF +^error: .*char 82.*$ +EOF + +check_verify_failure '"keywords" line check #1' + +############################################################ +# 14. keywords line check #2 + +cat >tag.sig <<EOF +object $head +type commit +tag mytag +keywords foo,bar baz +tagger bar@baz.com + +EOF + +cat >expect.pat <<EOF +^error: .*char 86.*$ +EOF + +check_verify_failure '"keywords" line check #2' + +############################################################ +# 15. keywords line check #3 + +cat >tag.sig <<EOF +object $head +type commit +tag mytag +keywords foo,,bar +tagger bar@baz.com + +EOF + +cat >expect.pat <<EOF +^error: .*char 82.*Found empty keyword.*$ +EOF + +check_verify_failure '"keywords" line check #3' + +############################################################ +# 16. tagger line label check #1 + +cat >tag.sig <<EOF +object $head +type commit +tag mytag + +EOF + +cat >expect.pat <<EOF +^error: .*char 70.*$ EOF check_verify_failure '"tagger" line label check #1' ############################################################ -# 12. tagger line label check #2 +# 17. tagger line label check #2 cat >tag.sig <<EOF object $head type commit tag mytag -tagger +xxxxxx bar@baz.com + EOF cat >expect.pat <<EOF
@@ -206,25 +315,104 @@ EOF check_verify_failure '"tagger" line label check #2' ############################################################ -# 13. create valid tag +# 18. tagger line label check #3 + +cat >tag.sig <<EOF +object $head +type commit +tag mytag +keywords foo +tagger + +EOF + +cat >expect.pat <<EOF +^error: .*char 83.*$ +EOF + +check_verify_failure '"tagger" line label check #3' + +############################################################ +# 19. create valid tag #1 cat >tag.sig <<EOF object $head type commit tag mytag tagger another@example.com + EOF test_expect_success \ - 'create valid tag' \ + 'create valid tag #1' \ 'git-mktag <tag.sig >.git/refs/tags/mytag 2>message' ############################################################ -# 14. check mytag +# 20. check mytag test_expect_success \ 'check mytag' \ 'git-tag -l | grep mytag' +############################################################ +# 21. create valid tag #2 + +cat >tag.sig <<EOF +object $head +type commit +tagger another@example.com + +EOF + +test_expect_success \ + 'create valid tag #2' \ + 'git-mktag <tag.sig >.git/refs/tags/mytag 2>message' + +############################################################ +# 22. create valid tag #3 + +cat >tag.sig <<EOF +object $head +type commit +keywords foo,bar,baz,spam,spam,spam,spam,spam,spam,spam,spam +tagger another@example.com + +EOF + +test_expect_success \ + 'create valid tag #3' \ + 'git-mktag <tag.sig >.git/refs/tags/mytag 2>message' + +############################################################ +# 23. create valid tag #4 + +cat >tag.sig <<EOF +object $head +type commit +tag mytag +keywords note +tagger another@example.com + +EOF + +test_expect_success \ + 'create valid tag #4' \ + 'git-mktag <tag.sig >.git/refs/tags/mytag 2>message' + +############################################################ +# 24. create valid tag #5 (with empty message) + +cat >tag.sig <<EOF +object $head +type commit +tag mytag +keywords note +tagger a +EOF + +test_expect_success \ + 'create valid tag #4' \ + 'git-mktag <tag.sig >.git/refs/tags/mytag 2>message' + test_done
--
1.5.2