diff options
Diffstat (limited to '')
| -rw-r--r-- | lang/qt/tests/t-config.cpp | 30 | ||||
| -rw-r--r-- | tests/gpg/t-gpgconf.c | 8 |
2 files changed, 4 insertions, 34 deletions
diff --git a/lang/qt/tests/t-config.cpp b/lang/qt/tests/t-config.cpp index afbb4d1b..9ec95669 100644 --- a/lang/qt/tests/t-config.cpp +++ b/lang/qt/tests/t-config.cpp @@ -50,36 +50,6 @@ class CryptoConfigTest: public QGpgMETest Q_OBJECT private Q_SLOTS: - void testKeyserver() - { - // Repeatedly set a config value and clear it - // this was broken at some point so it gets a - // unit test. - for (int i = 0; i < 10; i++) { - auto conf = cryptoConfig(); - QVERIFY(conf); - auto entry = conf->entry(QStringLiteral("gpg"), - QStringLiteral("Keyserver"), - QStringLiteral("keyserver")); - QVERIFY(entry); - const QString url(QStringLiteral("hkp://foo.bar.baz")); - entry->setStringValue(url); - conf->sync(false); - conf->clear(); - entry = conf->entry(QStringLiteral("gpg"), - QStringLiteral("Keyserver"), - QStringLiteral("keyserver")); - QCOMPARE (entry->stringValue(), url); - entry->setStringValue(QString()); - conf->sync(false); - conf->clear(); - entry = conf->entry(QStringLiteral("gpg"), - QStringLiteral("Keyserver"), - QStringLiteral("keyserver")); - QCOMPARE (entry->stringValue(), QString()); - } - } - void testDefault() { if (GpgME::engineInfo(GpgME::GpgEngine).engineVersion() < "2.2.0") { 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); |