projects / gpgme.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: a766b78)
2003-05-27 Marcus Brinkmann <marcus@g10code.de>
authorMarcus Brinkmann <mb@g10code.com>
Tue, 27 May 2003 05:07:19 +0000 (05:07 +0000)
committerMarcus Brinkmann <mb@g10code.com>
Tue, 27 May 2003 05:07:19 +0000 (05:07 +0000)
* 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-keylist.c: Change order of user IDs.
* gpg/t-keylist-sig.c: Likewise.
* gpg/t-import.c: Add support for gpg in CVS.

trunk/tests/ChangeLog patch | blob | history
trunk/tests/gpg/Makefile.am patch | blob | history
trunk/tests/gpg/t-edit.c patch | blob | history
trunk/tests/gpg/t-import.c patch | blob | history
trunk/tests/gpg/t-keylist-sig.c patch | blob | history
trunk/tests/gpg/t-keylist.c patch | blob | history

diff --git a/trunk/tests/ChangeLog b/trunk/tests/ChangeLog
index f31112a7f918c38c8520b4b99f578cffc1ad1ca3..98686fd481a3ae7d6757b39c4fe53e5d8b3f71e7 100644 (file)
--- a/trunk/tests/ChangeLog
+++ b/trunk/tests/ChangeLog
@@ -1,3 +1,13 @@
+2003-05-27  Marcus Brinkmann  <marcus@g10code.de>
+
+       * 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-keylist.c: Change order of user IDs.
+       * gpg/t-keylist-sig.c: Likewise.
+       * gpg/t-import.c: Add support for gpg in CVS.
+
 2003-05-27  Marcus Brinkmann  <marcus@g10code.de>
 
        * t-data.c: Remove TEST_OUT_CB.
diff --git a/trunk/tests/gpg/Makefile.am b/trunk/tests/gpg/Makefile.am
index 9120785a81b4b34b515fd7792106d85d70636be3..11ab0b03e2a9a841d33c29b14c555dbfc9b33e54 100644 (file)
--- a/trunk/tests/gpg/Makefile.am
+++ b/trunk/tests/gpg/Makefile.am
@@ -23,9 +23,11 @@ GPG = @GPG@
 
 TESTS_ENVIRONMENT = GNUPGHOME=. GPG_AGENT_INFO=
 
+# The keylist test must come after the import test.
 TESTS = t-encrypt t-encrypt-sym t-encrypt-sign t-sign t-signers        \
-       t-decrypt t-verify t-decrypt-verify t-keylist t-keylist-sig \
-       t-export t-import t-trustlist t-eventloop t-edit
+       t-decrypt t-verify t-decrypt-verify \
+       t-export t-import t-trustlist t-eventloop t-edit \
+       t-keylist t-keylist-sig
 
 CLEANFILES = secring.gpg pubring.gpg trustdb.gpg
 DISTCLEANFILES = pubring.gpg~ random_seed
diff --git a/trunk/tests/gpg/t-edit.c b/trunk/tests/gpg/t-edit.c
index 74f0cde4c5065c404f0704c55a0becc85d17ed62..fb2f62feab6ee52aca588fdcbeac3cb459b2d74a 100644 (file)
--- a/trunk/tests/gpg/t-edit.c
+++ b/trunk/tests/gpg/t-edit.c
@@ -92,6 +92,17 @@ edit_fnc (void *opaque, gpgme_status_code_t status, const char *args, int fd)
            case 1:
              result = "expire";
              break;
+
+             /* Work around a bug in GPG 1.2.2, which causes the
+                primary UID to change when setting the expiration
+                date.  */
+           case 2:
+             result = "1";
+             break;
+           case 3:
+             result = "primary";
+             break;
+
            default:
              result = "quit";
              break;
diff --git a/trunk/tests/gpg/t-import.c b/trunk/tests/gpg/t-import.c
index 3f500a2ff2b4e914954641f4946981dd412f4669..bea6a0d984f1bd99dc5865f9c380f3e0a8dd4d84 100644 (file)
--- a/trunk/tests/gpg/t-import.c
+++ b/trunk/tests/gpg/t-import.c
@@ -105,7 +105,10 @@ check_result (gpgme_import_result_t result, char *fpr, int secret)
               result->new_sub_keys);
       exit (1);
     }
-  if (result->new_signatures != 0)
+  if ((secret
+       && ((result->secret_imported == 0 && result->new_signatures != 0)
+          || (result->secret_imported == 1 && result->new_signatures != 1)))
+      || (!secret && result->new_signatures != 0))
     {
       fprintf (stderr, "Unexpected number of new signatures %i\n",
               result->new_signatures);
@@ -146,10 +149,22 @@ check_result (gpgme_import_result_t result, char *fpr, int secret)
               result->not_imported);
       exit (1);
     }
-  if (!result->imports || result->imports->next)
+  if (secret)
     {
-      fprintf (stderr, "Unexpected number of status reports\n");
-      exit (1);
+      if (!result->imports
+         || (result->imports->next && result->imports->next->next))
+       {
+         fprintf (stderr, "Unexpected number of status reports\n");
+         exit (1);
+       }
+    }
+  else
+    {
+      if (!result->imports || result->imports->next)
+       {
+         fprintf (stderr, "Unexpected number of status reports\n");
+         exit (1);
+       }
     }
   if (strcmp (fpr, result->imports->fpr))
     {
@@ -157,25 +172,52 @@ check_result (gpgme_import_result_t result, char *fpr, int secret)
               result->imports->fpr);
       exit (1);
     }
+  if (result->imports->next && strcmp (fpr, result->imports->next->fpr))
+    {
+      fprintf (stderr, "Unexpected fingerprint on second status %s\n",
+              result->imports->next->fpr);
+      exit (1);
+    }
   if (result->imports->result != 0)
     {
       fprintf (stderr, "Unexpected status result %s\n",
               gpgme_strerror (result->imports->result));
       exit (1);
     }
-  if ((secret
-       && ((result->secret_imported == 0
-           && result->imports->status != GPGME_IMPORT_SECRET)
-          || (result->secret_imported == 1
-              && result->imports->status != (GPGME_IMPORT_SECRET | GPGME_IMPORT_NEW))))
-      || (!secret
-         && ((result->imported == 0 && result->imports->status != 0)
-             || (result->imported == 1
-                 && result->imports->status != GPGME_IMPORT_NEW))))
-    {
-      fprintf (stderr, "Unexpected status %i\n",
-              result->imports->status);
-      exit (1);
+  if (secret)
+    {
+      if (result->secret_imported == 0)
+       {
+         if (result->imports->status != GPGME_IMPORT_SECRET)
+           {
+             fprintf (stderr, "Unexpected status %i\n",
+                      result->imports->status);
+             exit (1);
+           }
+       }
+      else
+       {
+         if (result->imports->status
+             != (GPGME_IMPORT_SECRET | GPGME_IMPORT_NEW)
+             || !result->imports->next
+             || result->imports->next->status != GPGME_IMPORT_SIG)
+           {
+             fprintf (stderr, "Unexpected status %i\n",
+                      result->imports->status);
+             exit (1);
+           }
+       }
+    }
+  else
+    {
+      if ((result->imported == 0 && result->imports->status != 0)
+         || (result->imported == 1
+             && result->imports->status != GPGME_IMPORT_NEW))
+       {
+         fprintf (stderr, "Unexpected status %i\n",
+                  result->imports->status);
+         exit (1);
+       }
     }
 }
 
diff --git a/trunk/tests/gpg/t-keylist-sig.c b/trunk/tests/gpg/t-keylist-sig.c
index 46260bfbcf158fa61dda00ac627fbb96d8c1eb14..63251ad725ecc4e1d683c004262c3ce978ff4fa3 100644 (file)
--- a/trunk/tests/gpg/t-keylist-sig.c
+++ b/trunk/tests/gpg/t-keylist-sig.c
@@ -62,15 +62,15 @@ struct
 keys[] =
   {
     { "A0FF4590BB6122EDEF6E3C542D727CC768697734", "6AE6D7EE46A871F8",
-      { { "Alpha Test", "demo key", "alpha@example.net",
+      { { "Alfa Test", "demo key", "alfa@example.net",
           { GPGME_PK_DSA, "2D727CC768697734",
-           "Alpha Test", "demo key", "alpha@example.net", 19, 1 } },
-       { "Alice", "demo key", NULL,
+           "Alfa Test", "demo key", "alfa@example.net", 19, 1 } },
+       { "Alpha Test", "demo key", "alpha@example.net",
           { GPGME_PK_DSA, "2D727CC768697734",
-           "Alpha Test", "demo key", "alpha@example.net", 19, 1 } },
-       { "Alfa Test", "demo key", "alfa@example.net",
+           "Alfa Test", "demo key", "alfa@example.net", 19, 1 } },
+       { "Alice", "demo key", NULL,
           { GPGME_PK_DSA, "2D727CC768697734",
-           "Alpha Test", "demo key", "alpha@example.net", 19, 1 } } } },
+           "Alfa Test", "demo key", "alfa@example.net", 19, 1 } } } },
     { NULL }
   };
 
diff --git a/trunk/tests/gpg/t-keylist.c b/trunk/tests/gpg/t-keylist.c
index 45e46a0f7686f94600c5b8202c890aad327c3997..a4c46ae8b35309e241f1a711899e44e848b5d95b 100644 (file)
--- a/trunk/tests/gpg/t-keylist.c
+++ b/trunk/tests/gpg/t-keylist.c
@@ -52,9 +52,9 @@ struct
 keys[] =
   {
     { "A0FF4590BB6122EDEF6E3C542D727CC768697734", "6AE6D7EE46A871F8",
-      { { "Alpha Test", "demo key", "alpha@example.net" },
-       { "Alice", "demo key", NULL },
-       { "Alfa Test", "demo key", "alfa@example.net" } } },
+      { { "Alfa Test", "demo key", "alfa@example.net" },
+        { "Alpha Test", "demo key", "alpha@example.net" },
+       { "Alice", "demo key", NULL } } },
     { "61EE841A2A27EB983B3B3C26413F4AF31AFDAB6C", "E71E72ACBC43DA60",
       { { "Charlie Test", "demo key", "charlie@example.net" } } },
     { "3531152DE293E26A07F504BC318C1FAEFAEF6D1B", "B5C79E1A7272144D",
GnuPG Made Easy, a library wrapping calls to the GnuPG binary.