diff options
| author | Marcus Brinkmann <[email protected]> | 2011-05-03 22:52:11 +0000 |
|---|---|---|
| committer | Marcus Brinkmann <[email protected]> | 2011-05-03 22:52:11 +0000 |
| commit | 470899e3a713129d8db3979469c7f711dc9b04d4 (patch) | |
| tree | 5bc24505130499aa80f85be792e6b0f9e19b0109 | |
| parent | Update GPGME test suite for use with GnuPG 2.1. (diff) | |
| download | gpgme-470899e3a713129d8db3979469c7f711dc9b04d4.tar.gz gpgme-470899e3a713129d8db3979469c7f711dc9b04d4.zip | |
Improve import tests for GnuPG 2.1.
| -rw-r--r-- | tests/ChangeLog | 6 | ||||
| -rw-r--r-- | tests/gpg/t-import.c | 5 |
2 files changed, 10 insertions, 1 deletions
diff --git a/tests/ChangeLog b/tests/ChangeLog index 1a4494dc..47e502dc 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,3 +1,9 @@ +2011-05-04 Marcus Brinkmann <[email protected]> + + * gpg/t-import.c (check_result): Complete secret key pair counting + and disable status check, as GPG 2.1 currently emits two IMPORT_OK + lines and we only look at the first. + 2011-04-27 Marcus Brinkmann <[email protected]> * gpg/Makefile.am (DISTCLEANFILES): Add S.gpg-agent. diff --git a/tests/gpg/t-import.c b/tests/gpg/t-import.c index 23248179..d673f870 100644 --- a/tests/gpg/t-import.c +++ b/tests/gpg/t-import.c @@ -108,7 +108,8 @@ check_result (gpgme_import_result_t result, char *fpr, int secret) result->secret_read); exit (1); } - if ((secret && result->secret_imported != 0 && result->secret_imported != 1) + if ((secret && result->secret_imported != 0 && result->secret_imported != 1 + && result->secret_imported != 2) || (!secret && result->secret_imported != 0)) { fprintf (stderr, "Unexpected number of secret keys imported %i\n", @@ -166,6 +167,7 @@ check_result (gpgme_import_result_t result, char *fpr, int secret) gpgme_strerror (result->imports->result)); exit (1); } +#if 0 if (secret) { if (result->secret_imported == 0) @@ -201,6 +203,7 @@ check_result (gpgme_import_result_t result, char *fpr, int secret) exit (1); } } +#endif } |