GpgFrontend/gpgme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve import tests for GnuPG 2.1.

Browse Source
This commit is contained in:
Marcus Brinkmann 2011-05-04 00:52:11 +02:00
parent 43f38db1af
commit 470899e3a7
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/ChangeLog
View File

@ -1,3 +1,9 @@
2011-05-04 Marcus Brinkmann <marcus@g10code.com>
* 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 <marcus@g10code.com> 2011-04-27 Marcus Brinkmann <marcus@g10code.com>
* gpg/Makefile.am (DISTCLEANFILES): Add S.gpg-agent. * gpg/Makefile.am (DISTCLEANFILES): Add S.gpg-agent.

5
tests/gpg/t-import.c
View File

@ -108,7 +108,8 @@ check_result (gpgme_import_result_t result, char *fpr, int secret)
result->secret_read); result->secret_read);
exit (1); 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)) || (!secret && result->secret_imported != 0))
{ {
fprintf (stderr, "Unexpected number of secret keys imported %i\n", 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)); gpgme_strerror (result->imports->result));
exit (1); exit (1);
} }
#if 0
if (secret) if (secret)
{ {
if (result->secret_imported == 0) if (result->secret_imported == 0)
@ -201,6 +203,7 @@ check_result (gpgme_import_result_t result, char *fpr, int secret)
exit (1); exit (1);
} }
} }
#endif
} }