diff options
| author | Marcus Brinkmann <[email protected]> | 2011-04-27 10:56:19 +0000 |
|---|---|---|
| committer | Marcus Brinkmann <[email protected]> | 2011-04-27 16:03:46 +0000 |
| commit | 43f38db1afe9830b888076adeec1eec21f32335c (patch) | |
| tree | 388b99bc09ea279d33a760a54011008c410d7a86 /tests/gpg/t-import.c | |
| parent | Require autoconf 1.11 (diff) | |
| download | gpgme-43f38db1afe9830b888076adeec1eec21f32335c.tar.gz gpgme-43f38db1afe9830b888076adeec1eec21f32335c.zip | |
Update GPGME test suite for use with GnuPG 2.1.
Diffstat (limited to 'tests/gpg/t-import.c')
| -rw-r--r-- | tests/gpg/t-import.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/tests/gpg/t-import.c b/tests/gpg/t-import.c index db5f9257..23248179 100644 --- a/tests/gpg/t-import.c +++ b/tests/gpg/t-import.c @@ -38,7 +38,7 @@ void check_result (gpgme_import_result_t result, char *fpr, int secret) { - if (result->considered != 1) + if (result->considered != 1 && (secret && result->considered != 3)) { fprintf (stderr, "Unexpected number of considered keys %i\n", result->considered); @@ -63,7 +63,7 @@ check_result (gpgme_import_result_t result, char *fpr, int secret) result->imported_rsa); exit (1); } - if ((secret && result->unchanged != 0) + if ((secret && (result->unchanged != 0 && result->unchanged != 1)) || (!secret && ((result->imported == 0 && result->unchanged != 1) || (result->imported == 1 && result->unchanged != 0)))) { @@ -101,7 +101,7 @@ check_result (gpgme_import_result_t result, char *fpr, int secret) result->new_revocations); exit (1); } - if ((secret && result->secret_read != 1) + if ((secret && result->secret_read != 1 && result->secret_read != 3) || (!secret && result->secret_read != 0)) { fprintf (stderr, "Unexpected number of secret keys read %i\n", @@ -116,7 +116,8 @@ check_result (gpgme_import_result_t result, char *fpr, int secret) exit (1); } if ((secret - && ((result->secret_imported == 0 && result->secret_unchanged != 1) + && ((result->secret_imported == 0 && result->secret_unchanged != 1 + && result->secret_unchanged != 2) || (result->secret_imported == 1 && result->secret_unchanged != 0))) || (!secret && result->secret_unchanged != 0)) { |