[PATCH v6 2/9] t/fmt-merge-msg: make gpgssh tests more specific
flat view
STALE1771d
From: Fabian Stelzer <hidden>
Date: 2021-12-09 08:52:57
Subsystem:
the rest · Maintainer:
Linus Torvalds
Revision v6 of 7 in this series.
Revisions (7)
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 <redacted> --- t/t6200-fmt-merge-msg.sh | 2 ++ 1 file changed, 2 insertions(+)
diff --git a/t/t6200-fmt-merge-msg.sh b/t/t6200-fmt-merge-msg.sh
index cc68bba064..eb2a9a4a78 100755
--- a/t/t6200-fmt-merge-msg.sh
+++ b/t/t6200-fmt-merge-msg.sh@@ -124,6 +124,7 @@ test_expect_success GPGSSH 'message for merging local tag signed by good ssh key git checkout main && git fetch . signed-good-ssh-tag && git fmt-merge-msg <.git/FETCH_HEAD >actual && + grep "^Merge tag ${apos}signed-good-ssh-tag${apos}" actual && grep "${GPGSSH_GOOD_SIGNATURE_TRUSTED}" actual && ! grep "${GPGSSH_BAD_SIGNATURE}" actual '
@@ -133,6 +134,7 @@ test_expect_success GPGSSH 'message for merging local tag signed by unknown ssh git checkout main && git fetch . signed-untrusted-ssh-tag && git fmt-merge-msg <.git/FETCH_HEAD >actual && + grep "^Merge tag ${apos}signed-untrusted-ssh-tag${apos}" actual && grep "${GPGSSH_GOOD_SIGNATURE_UNTRUSTED}" actual && ! grep "${GPGSSH_BAD_SIGNATURE}" actual && grep "${GPGSSH_KEY_NOT_TRUSTED}" actual
--
2.31.1