t/fmt-merge-msg: make gpgssh tests more specific
Some GPGSSH fmt-merge-msg tests were only grepping for failed/successful signature validation and not checking for the tag in the resulting merge message. Add the missing grep for it. Signed-off-by: Fabian Stelzer <fs@gigacodes.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Fabian Stelzer committed
Dec 9, 2021 at 09:52 UTC
cafd34522f13e66b35bfcf00c04bc82f685a8ce9
1 file changed
+2
t/t6200-fmt-merge-msg.sh
+2
@@ -124,6 +124,7 @@ test_expect_success GPGSSH 'message for merging local tag signed by good ssh key
124
git checkout main &&
125
git fetch . signed-good-ssh-tag &&
126
git fmt-merge-msg <.git/FETCH_HEAD >actual &&
127
+ grep "^Merge tag ${apos}signed-good-ssh-tag${apos}" actual &&
128
grep "${GPGSSH_GOOD_SIGNATURE_TRUSTED}" actual &&
129
! grep "${GPGSSH_BAD_SIGNATURE}" actual
130
'
@@ -133,6 +134,7 @@ test_expect_success GPGSSH 'message for merging local tag signed by unknown ssh
134
git checkout main &&
135
git fetch . signed-untrusted-ssh-tag &&
136
git fmt-merge-msg <.git/FETCH_HEAD >actual &&
137
+ grep "^Merge tag ${apos}signed-untrusted-ssh-tag${apos}" actual &&
138
grep "${GPGSSH_GOOD_SIGNATURE_UNTRUSTED}" actual &&
139
! grep "${GPGSSH_BAD_SIGNATURE}" actual &&
140
grep "${GPGSSH_KEY_NOT_TRUSTED}" actual