mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
Merge branch 'sg/gpg-tests-fix'
Some flaky tests have been fixed. * sg/gpg-tests-fix: tests: make forging GPG signed commits and tags more robust t7510-signed-commit: use 'test_must_fail'
This commit is contained in:
commit
078f3dc0ce
|
@ -29,7 +29,7 @@ test_expect_success GPG 'create repositories with signed commits' '
|
|||
echo 4 >d && git add d &&
|
||||
test_tick && git commit -S -m "bad" &&
|
||||
git cat-file commit HEAD >raw &&
|
||||
sed -e "s/bad/forged bad/" raw >forged &&
|
||||
sed -e "s/^bad/forged bad/" raw >forged &&
|
||||
git hash-object -w -t commit forged >forged.commit &&
|
||||
git checkout $(cat forged.commit)
|
||||
) &&
|
||||
|
|
|
@ -74,7 +74,7 @@ test_expect_success GPG 'verify and show signatures' '
|
|||
|
||||
test_expect_success GPG 'detect fudged signature' '
|
||||
git cat-file tag seventh-signed >raw &&
|
||||
sed -e "s/seventh/7th forged/" raw >forged1 &&
|
||||
sed -e "/^tag / s/seventh/7th forged/" raw >forged1 &&
|
||||
git hash-object -w -t tag forged1 >forged1.tag &&
|
||||
test_must_fail git verify-tag $(cat forged1.tag) 2>actual1 &&
|
||||
grep "BAD signature from" actual1 &&
|
||||
|
|
|
@ -142,10 +142,9 @@ test_expect_success GPG 'show signed commit with signature' '
|
|||
|
||||
test_expect_success GPG 'detect fudged signature' '
|
||||
git cat-file commit seventh-signed >raw &&
|
||||
|
||||
sed -e "s/seventh/7th forged/" raw >forged1 &&
|
||||
sed -e "s/^seventh/7th forged/" raw >forged1 &&
|
||||
git hash-object -w -t commit forged1 >forged1.commit &&
|
||||
! git verify-commit $(cat forged1.commit) &&
|
||||
test_must_fail git verify-commit $(cat forged1.commit) &&
|
||||
git show --pretty=short --show-signature $(cat forged1.commit) >actual1 &&
|
||||
grep "BAD signature from" actual1 &&
|
||||
! grep "Good signature from" actual1
|
||||
|
@ -156,7 +155,7 @@ test_expect_success GPG 'detect fudged signature with NUL' '
|
|||
cat raw >forged2 &&
|
||||
echo Qwik | tr "Q" "\000" >>forged2 &&
|
||||
git hash-object -w -t commit forged2 >forged2.commit &&
|
||||
! git verify-commit $(cat forged2.commit) &&
|
||||
test_must_fail git verify-commit $(cat forged2.commit) &&
|
||||
git show --pretty=short --show-signature $(cat forged2.commit) >actual2 &&
|
||||
grep "BAD signature from" actual2 &&
|
||||
! grep "Good signature from" actual2
|
||||
|
|
|
@ -23,7 +23,7 @@ test_expect_success GPG 'create signed commits' '
|
|||
echo 3 >bar && git add bar &&
|
||||
test_tick && git commit -S -m "bad on side" &&
|
||||
git cat-file commit side-bad >raw &&
|
||||
sed -e "s/bad/forged bad/" raw >forged &&
|
||||
sed -e "s/^bad/forged bad/" raw >forged &&
|
||||
git hash-object -w -t commit forged >forged.commit &&
|
||||
git checkout initial &&
|
||||
|
||||
|
|
Loading…
Reference in a new issue