From 64b0e7004ff9df4ca05c2fe1efcae469d0b19261 Mon Sep 17 00:00:00 2001
From: Marcus Brinkmann <mb@g10code.com>
Date: Tue, 27 May 2003 08:31:33 +0000
Subject: [PATCH] Fix last changes.

---
 tests/ChangeLog       | 3 +--
 tests/gpg/Makefile.am | 2 +-
 tests/gpg/t-edit.c    | 5 ++---
 tests/gpg/t-import.c  | 6 +++---
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/tests/ChangeLog b/tests/ChangeLog
index 98686fd4..883ec7fa 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -2,8 +2,7 @@
 
 	* gpg/Makefile.am (TESTS): Order t-keylist and t-keylist-sig after
 	t-import.
-	* gpg/t-edit.c (edit_fnc): Work around gpg 1.2.2 bug by resetting
-	primary uid after setting expiration date.
+	* gpg/t-edit.c (edit_fnc): Fix primary UID for keylisting tests.
 	* gpg/t-keylist.c: Change order of user IDs.
 	* gpg/t-keylist-sig.c: Likewise.
 	* gpg/t-import.c: Add support for gpg in CVS.
diff --git a/tests/gpg/Makefile.am b/tests/gpg/Makefile.am
index 11ab0b03..370778c3 100644
--- a/tests/gpg/Makefile.am
+++ b/tests/gpg/Makefile.am
@@ -23,7 +23,7 @@ GPG = @GPG@
 
 TESTS_ENVIRONMENT = GNUPGHOME=. GPG_AGENT_INFO=
 
-# The keylist test must come after the import test.
+# The keylist tests must come after the import and the edit test.
 TESTS = t-encrypt t-encrypt-sym t-encrypt-sign t-sign t-signers	\
 	t-decrypt t-verify t-decrypt-verify \
 	t-export t-import t-trustlist t-eventloop t-edit \
diff --git a/tests/gpg/t-edit.c b/tests/gpg/t-edit.c
index fb2f62fe..9238503e 100644
--- a/tests/gpg/t-edit.c
+++ b/tests/gpg/t-edit.c
@@ -93,9 +93,8 @@ edit_fnc (void *opaque, gpgme_status_code_t status, const char *args, int fd)
 	      result = "expire";
 	      break;
 
-	      /* Work around a bug in GPG 1.2.2, which causes the
-		 primary UID to change when setting the expiration
-		 date.  */
+	      /* This fixes the primary user ID so the keylisting
+		 tests will have predictable output.  */
 	    case 2:
 	      result = "1";
 	      break;
diff --git a/tests/gpg/t-import.c b/tests/gpg/t-import.c
index bea6a0d9..fd275080 100644
--- a/tests/gpg/t-import.c
+++ b/tests/gpg/t-import.c
@@ -107,7 +107,7 @@ check_result (gpgme_import_result_t result, char *fpr, int secret)
     }
   if ((secret
        && ((result->secret_imported == 0 && result->new_signatures != 0)
-	   || (result->secret_imported == 1 && result->new_signatures != 1)))
+	   || (result->secret_imported == 1 && result->new_signatures > 1)))
       || (!secret && result->new_signatures != 0))
     {
       fprintf (stderr, "Unexpected number of new signatures %i\n",
@@ -199,8 +199,8 @@ check_result (gpgme_import_result_t result, char *fpr, int secret)
 	{
 	  if (result->imports->status
 	      != (GPGME_IMPORT_SECRET | GPGME_IMPORT_NEW)
-	      || !result->imports->next
-	      || result->imports->next->status != GPGME_IMPORT_SIG)
+	      || (result->imports->next
+		  && result->imports->next->status != GPGME_IMPORT_SIG))
 	    {
 	      fprintf (stderr, "Unexpected status %i\n",
 		       result->imports->status);