[git] GPGME - branch, master, updated. gpgme-1.1.8-174-g470899e

[by Marcus Brinkmann]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GnuPG Made Easy".

The branch, master has been updated
       via  470899e3a713129d8db3979469c7f711dc9b04d4 (commit)
      from  43f38db1afe9830b888076adeec1eec21f32335c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 470899e3a713129d8db3979469c7f711dc9b04d4
Author: Marcus Brinkmann <marcus.brinkmann at ruhr-uni-bochum.de>
Date:   Wed May 4 00:52:11 2011 +0200

    Improve import tests for GnuPG 2.1.

diff --git a/tests/ChangeLog b/tests/ChangeLog
index 1a4494d..47e502d 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,9 @@
+2011-05-04  Marcus Brinkmann  <marcus at 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 at g10code.com>
 
 	* gpg/Makefile.am (DISTCLEANFILES): Add S.gpg-agent.
diff --git a/tests/gpg/t-import.c b/tests/gpg/t-import.c
index 2324817..d673f87 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
 }
 
 

-----------------------------------------------------------------------

Summary of changes:
 tests/ChangeLog      |    6 ++++++
 tests/gpg/t-import.c |    5 ++++-
 2 files changed, 10 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
GnuPG Made Easy
http://git.gnupg.org