From 0cc040e82f9943792a58e73dbc97e20d312858fb Mon Sep 17 00:00:00 2001 From: NIIBE Yutaka Date: Mon, 11 May 2020 14:20:48 +0900 Subject: tests: Remove/change tests for GnuPG 2.3 with no gpg.keyserver. * lang/qt/tests/t-config.cpp (testKeyserver): Remove. * tests/gpg/t-gpgconf.c (main): Test with dirmngr.keyserver. Signed-off-by: NIIBE Yutaka --- tests/gpg/t-gpgconf.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'tests') diff --git a/tests/gpg/t-gpgconf.c b/tests/gpg/t-gpgconf.c index d7a5f1ee..8e2bb3e1 100644 --- a/tests/gpg/t-gpgconf.c +++ b/tests/gpg/t-gpgconf.c @@ -340,7 +340,7 @@ main (void) } /* Now change something else. */ - fprintf (stderr, " gpg.keyserver "); + fprintf (stderr, " dirmngr.keyserver "); for (i = 0; i < N; i++) { const char *values[2] = { "hkp://foo.bar", "hkps://bar.foo" }; gpgme_conf_arg_t arg; @@ -349,7 +349,7 @@ main (void) err = gpgme_conf_arg_new (&arg, GPGME_CONF_STRING, values[i%2]); fail_if_err (err); - if (lookup (conf, "gpg", "keyserver", &comp, &opt)) + if (lookup (conf, "dirmngr", "keyserver", &comp, &opt)) { /* Found. */ test (opt->alt_type == GPGME_CONF_STRING); @@ -361,7 +361,7 @@ main (void) } else { - fprintf (stderr, "Skipping test, option gpg.keyserver not found.\n"); + fprintf (stderr, "Skipping test, option dirmngr.keyserver not found.\n"); break; } @@ -369,7 +369,7 @@ main (void) gpgme_conf_release (conf); err = gpgme_op_conf_load (ctx, &conf); fail_if_err (err); - if (lookup (conf, "gpg", "keyserver", &comp, &opt)) + if (lookup (conf, "dirmngr", "keyserver", &comp, &opt)) { /* Found. */ test (opt->alt_type == GPGME_CONF_STRING); -- cgit v1.2.3