diff options
Diffstat (limited to 't/t5573-pull-verify-signatures.sh')
| -rwxr-xr-x | t/t5573-pull-verify-signatures.sh | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/t/t5573-pull-verify-signatures.sh b/t/t5573-pull-verify-signatures.sh index 1221ac0597..ab05f38a99 100755 --- a/t/t5573-pull-verify-signatures.sh +++ b/t/t5573-pull-verify-signatures.sh @@ -47,46 +47,46 @@ test_expect_success GPG 'create repositories with signed commits' ' test_expect_success GPG 'pull unsigned commit with --verify-signatures' ' test_when_finished "git reset --hard && git checkout initial" && test_must_fail git pull --ff-only --verify-signatures unsigned 2>pullerror && - test_i18ngrep "does not have a GPG signature" pullerror + test_grep "does not have a GPG signature" pullerror ' test_expect_success GPG 'pull commit with bad signature with --verify-signatures' ' test_when_finished "git reset --hard && git checkout initial" && test_must_fail git pull --ff-only --verify-signatures bad 2>pullerror && - test_i18ngrep "has a bad GPG signature" pullerror + test_grep "has a bad GPG signature" pullerror ' test_expect_success GPG 'pull commit with untrusted signature with --verify-signatures' ' test_when_finished "git reset --hard && git checkout initial" && test_must_fail git pull --ff-only --verify-signatures untrusted 2>pullerror && - test_i18ngrep "has an untrusted GPG signature" pullerror + test_grep "has an untrusted GPG signature" pullerror ' test_expect_success GPG 'pull commit with untrusted signature with --verify-signatures and minTrustLevel=ultimate' ' test_when_finished "git reset --hard && git checkout initial" && test_config gpg.minTrustLevel ultimate && test_must_fail git pull --ff-only --verify-signatures untrusted 2>pullerror && - test_i18ngrep "has an untrusted GPG signature" pullerror + test_grep "has an untrusted GPG signature" pullerror ' test_expect_success GPG 'pull commit with untrusted signature with --verify-signatures and minTrustLevel=marginal' ' test_when_finished "git reset --hard && git checkout initial" && test_config gpg.minTrustLevel marginal && test_must_fail git pull --ff-only --verify-signatures untrusted 2>pullerror && - test_i18ngrep "has an untrusted GPG signature" pullerror + test_grep "has an untrusted GPG signature" pullerror ' test_expect_success GPG 'pull commit with untrusted signature with --verify-signatures and minTrustLevel=undefined' ' test_when_finished "git reset --hard && git checkout initial" && test_config gpg.minTrustLevel undefined && git pull --ff-only --verify-signatures untrusted >pulloutput && - test_i18ngrep "has a good GPG signature" pulloutput + test_grep "has a good GPG signature" pulloutput ' test_expect_success GPG 'pull signed commit with --verify-signatures' ' test_when_finished "git reset --hard && git checkout initial" && git pull --verify-signatures signed >pulloutput && - test_i18ngrep "has a good GPG signature" pulloutput + test_grep "has a good GPG signature" pulloutput ' test_expect_success GPG 'pull commit with bad signature without verification' ' @@ -106,7 +106,7 @@ test_expect_success GPG 'pull unsigned commit into unborn branch' ' git init empty-repo && test_must_fail \ git -C empty-repo pull --verify-signatures .. 2>pullerror && - test_i18ngrep "does not have a GPG signature" pullerror + test_grep "does not have a GPG signature" pullerror ' test_expect_success GPG 'pull commit into unborn branch with bad signature and --verify-signatures' ' @@ -114,7 +114,7 @@ test_expect_success GPG 'pull commit into unborn branch with bad signature and - git init empty-repo && test_must_fail \ git -C empty-repo pull --ff-only --verify-signatures ../bad 2>pullerror && - test_i18ngrep "has a bad GPG signature" pullerror + test_grep "has a bad GPG signature" pullerror ' test_expect_success GPG 'pull commit into unborn branch with untrusted signature and --verify-signatures' ' @@ -122,7 +122,7 @@ test_expect_success GPG 'pull commit into unborn branch with untrusted signature git init empty-repo && test_must_fail \ git -C empty-repo pull --ff-only --verify-signatures ../untrusted 2>pullerror && - test_i18ngrep "has an untrusted GPG signature" pullerror + test_grep "has an untrusted GPG signature" pullerror ' test_expect_success GPG 'pull commit into unborn branch with untrusted signature and --verify-signatures and minTrustLevel=ultimate' ' @@ -131,7 +131,7 @@ test_expect_success GPG 'pull commit into unborn branch with untrusted signature test_config_global gpg.minTrustLevel ultimate && test_must_fail \ git -C empty-repo pull --ff-only --verify-signatures ../untrusted 2>pullerror && - test_i18ngrep "has an untrusted GPG signature" pullerror + test_grep "has an untrusted GPG signature" pullerror ' test_expect_success GPG 'pull commit into unborn branch with untrusted signature and --verify-signatures and minTrustLevel=marginal' ' @@ -140,7 +140,7 @@ test_expect_success GPG 'pull commit into unborn branch with untrusted signature test_config_global gpg.minTrustLevel marginal && test_must_fail \ git -C empty-repo pull --ff-only --verify-signatures ../untrusted 2>pullerror && - test_i18ngrep "has an untrusted GPG signature" pullerror + test_grep "has an untrusted GPG signature" pullerror ' test_expect_success GPG 'pull commit into unborn branch with untrusted signature and --verify-signatures and minTrustLevel=undefined' ' @@ -148,7 +148,7 @@ test_expect_success GPG 'pull commit into unborn branch with untrusted signature git init empty-repo && test_config_global gpg.minTrustLevel undefined && git -C empty-repo pull --ff-only --verify-signatures ../untrusted >pulloutput && - test_i18ngrep "has a good GPG signature" pulloutput + test_grep "has a good GPG signature" pulloutput ' test_done |