diff options
author | Colin Walters <walters@verbum.org> | 2023-05-03 08:24:21 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-05-03 08:24:21 -0400 |
commit | 8a2993a9d01cc358e4c2d936ca132174aabdc714 (patch) | |
tree | 5402001ab710dadfd51ba3e9071b044016030e3e /tests/test-gpg-verify-result.c | |
parent | dd70c9b78cc34ccc7e638eda4c2df1ddd8ee3add (diff) | |
parent | c1044a02b28982ef6dd58af98b23a40482d26487 (diff) | |
download | ostree-8a2993a9d01cc358e4c2d936ca132174aabdc714.tar.gz |
Merge pull request #2565 from cgwalters/clang-format
Add .clang-format file + tree-wide: Run `clang-format`
Diffstat (limited to 'tests/test-gpg-verify-result.c')
-rw-r--r-- | tests/test-gpg-verify-result.c | 354 |
1 files changed, 118 insertions, 236 deletions
diff --git a/tests/test-gpg-verify-result.c b/tests/test-gpg-verify-result.c index 8485b888..e7171a89 100644 --- a/tests/test-gpg-verify-result.c +++ b/tests/test-gpg-verify-result.c @@ -19,51 +19,55 @@ #include "config.h" -#include <gpgme.h> #include "libglnx.h" +#include <gpgme.h> #include "ostree-gpg-verify-result-private.h" #define assert_no_gpg_error(err, filename) \ - G_STMT_START { \ - if (err != GPG_ERR_NO_ERROR) { \ - g_autoptr(GString) string = g_string_new ("assertion failed "); \ - g_string_append_printf (string, "%s: %s ", gpgme_strsource (err), gpgme_strerror (err)); \ - g_string_append (string, filename ? filename : ""); \ - g_assertion_message (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, string->str); \ - } \ - } G_STMT_END + G_STMT_START \ + { \ + if (err != GPG_ERR_NO_ERROR) \ + { \ + g_autoptr (GString) string = g_string_new ("assertion failed "); \ + g_string_append_printf (string, "%s: %s ", gpgme_strsource (err), gpgme_strerror (err)); \ + g_string_append (string, filename ? filename : ""); \ + g_assertion_message (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, string->str); \ + } \ + } \ + G_STMT_END #define assert_str_contains(s1, s2) \ - G_STMT_START { \ + G_STMT_START \ + { \ const char *__s1 = (s1), *__s2 = (s2); \ - if (strstr (__s1, __s2) == NULL) { \ - g_autoptr(GString) string = g_string_new ("assertion failed (" #s1 " contains " #s2 "): "); \ - g_autofree char *__es1 = g_strescape (__s1, NULL); \ - g_autofree char *__es2 = g_strescape (__s2, NULL); \ - g_string_append_printf (string, "(\"%s\", \"%s\")", __es1, __es2); \ - g_assertion_message (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, string->str); \ - } \ - } G_STMT_END - -typedef struct { + if (strstr (__s1, __s2) == NULL) \ + { \ + g_autoptr (GString) string \ + = g_string_new ("assertion failed (" #s1 " contains " #s2 "): "); \ + g_autofree char *__es1 = g_strescape (__s1, NULL); \ + g_autofree char *__es2 = g_strescape (__s2, NULL); \ + g_string_append_printf (string, "(\"%s\", \"%s\")", __es1, __es2); \ + g_assertion_message (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, string->str); \ + } \ + } \ + G_STMT_END + +typedef struct +{ OstreeGpgVerifyResult *result; } TestFixture; static OstreeGpgSignatureAttr some_attributes[] = { - OSTREE_GPG_SIGNATURE_ATTR_VALID, - OSTREE_GPG_SIGNATURE_ATTR_SIG_EXPIRED, - OSTREE_GPG_SIGNATURE_ATTR_KEY_EXPIRED, - OSTREE_GPG_SIGNATURE_ATTR_KEY_REVOKED, - OSTREE_GPG_SIGNATURE_ATTR_KEY_MISSING, - OSTREE_GPG_SIGNATURE_ATTR_KEY_EXP_TIMESTAMP, + OSTREE_GPG_SIGNATURE_ATTR_VALID, OSTREE_GPG_SIGNATURE_ATTR_SIG_EXPIRED, + OSTREE_GPG_SIGNATURE_ATTR_KEY_EXPIRED, OSTREE_GPG_SIGNATURE_ATTR_KEY_REVOKED, + OSTREE_GPG_SIGNATURE_ATTR_KEY_MISSING, OSTREE_GPG_SIGNATURE_ATTR_KEY_EXP_TIMESTAMP, }; static void -test_fixture_setup (TestFixture *fixture, - gconstpointer user_data) +test_fixture_setup (TestFixture *fixture, gconstpointer user_data) { - const char * const *sig_files = user_data; + const char *const *sig_files = user_data; gpgme_error_t gpg_error; gpgme_data_t data_buffer; gpgme_data_t signature_buffer; @@ -81,8 +85,7 @@ test_fixture_setup (TestFixture *fixture, gboolean is_ok = g_setenv ("GNUPGHOME", homedir, TRUE); g_assert (is_ok == TRUE); - result = g_initable_new (OSTREE_TYPE_GPG_VERIFY_RESULT, - NULL, &local_error, NULL); + result = g_initable_new (OSTREE_TYPE_GPG_VERIFY_RESULT, NULL, &local_error, NULL); g_assert_no_error (local_error); g_autofree char *data_filename = g_build_filename (homedir, "lgpl2", NULL); @@ -102,15 +105,15 @@ test_fixture_setup (TestFixture *fixture, gpg_error = gpgme_data_new (&signature_buffer); assert_no_gpg_error (gpg_error, NULL); - for (const char * const *name = sig_files; *name != NULL; name++) + for (const char *const *name = sig_files; *name != NULL; name++) { g_autofree char *path = g_build_filename (homedir, *name, NULL); - g_autoptr(GFile) sig_file = g_file_new_for_path (path); + g_autoptr (GFile) sig_file = g_file_new_for_path (path); g_autofree char *contents = NULL; gsize len; - g_assert_true (g_file_load_contents (sig_file, NULL, &contents, - &len, NULL, &local_error)); + g_assert_true ( + g_file_load_contents (sig_file, NULL, &contents, &len, NULL, &local_error)); g_assert_no_error (local_error); char *cur = contents; @@ -127,8 +130,7 @@ test_fixture_setup (TestFixture *fixture, gpgme_data_seek (signature_buffer, 0, SEEK_SET); } - gpg_error = gpgme_op_verify (result->context, - signature_buffer, data_buffer, NULL); + gpg_error = gpgme_op_verify (result->context, signature_buffer, data_buffer, NULL); assert_no_gpg_error (gpg_error, NULL); result->details = gpgme_op_verify_result (result->context); @@ -141,15 +143,13 @@ test_fixture_setup (TestFixture *fixture, } static void -test_fixture_teardown (TestFixture *fixture, - gconstpointer user_data) +test_fixture_teardown (TestFixture *fixture, gconstpointer user_data) { g_clear_object (&fixture->result); } static void -test_check_counts (TestFixture *fixture, - gconstpointer user_data) +test_check_counts (TestFixture *fixture, gconstpointer user_data) { guint count_all; guint count_valid; @@ -162,8 +162,7 @@ test_check_counts (TestFixture *fixture, } static void -test_signature_lookup (TestFixture *fixture, - gconstpointer user_data) +test_signature_lookup (TestFixture *fixture, gconstpointer user_data) { /* Checking the signature with the revoked key for this case. */ guint expected_signature_index = 2; @@ -176,33 +175,29 @@ test_signature_lookup (TestFixture *fixture, /* Lookup full fingerprint. */ signature_index = 999999; - signature_found = ostree_gpg_verify_result_lookup (fixture->result, - fingerprint, - &signature_index); + signature_found + = ostree_gpg_verify_result_lookup (fixture->result, fingerprint, &signature_index); g_assert_true (signature_found); g_assert_cmpint (signature_index, ==, expected_signature_index); /* Lookup abbreviated key ID. */ signature_index = 999999; - signature_found = ostree_gpg_verify_result_lookup (fixture->result, - fingerprint + 32, - &signature_index); + signature_found + = ostree_gpg_verify_result_lookup (fixture->result, fingerprint + 32, &signature_index); g_assert_true (signature_found); g_assert_cmpint (signature_index, ==, expected_signature_index); /* Bogus fingerprint, index should remain unchanged. */ signature_index = expected_signature_index = 999999; fingerprint = "CAFEBABECAFEBABECAFEBABECAFEBABECAFEBABE"; - signature_found = ostree_gpg_verify_result_lookup (fixture->result, - fingerprint, - &signature_index); + signature_found + = ostree_gpg_verify_result_lookup (fixture->result, fingerprint, &signature_index); g_assert_false (signature_found); g_assert_cmpint (signature_index, ==, expected_signature_index); } static void -test_attribute_basics (TestFixture *fixture, - gconstpointer user_data) +test_attribute_basics (TestFixture *fixture, gconstpointer user_data) { guint n_signatures, ii; @@ -210,7 +205,7 @@ test_attribute_basics (TestFixture *fixture, for (ii = 0; ii < n_signatures; ii++) { - g_autoptr(GVariant) tuple = NULL; + g_autoptr (GVariant) tuple = NULL; const char *attr_string; const char *type_string; gboolean key_missing; @@ -222,31 +217,21 @@ test_attribute_basics (TestFixture *fixture, /* Check attributes which should be common to all signatures. */ - g_variant_get_child (tuple, - OSTREE_GPG_SIGNATURE_ATTR_PUBKEY_ALGO_NAME, - "&s", &attr_string); + g_variant_get_child (tuple, OSTREE_GPG_SIGNATURE_ATTR_PUBKEY_ALGO_NAME, "&s", &attr_string); g_assert_cmpstr (attr_string, ==, "RSA"); - g_variant_get_child (tuple, - OSTREE_GPG_SIGNATURE_ATTR_HASH_ALGO_NAME, - "&s", &attr_string); + g_variant_get_child (tuple, OSTREE_GPG_SIGNATURE_ATTR_HASH_ALGO_NAME, "&s", &attr_string); g_assert_cmpstr (attr_string, ==, "SHA1"); - g_variant_get_child (tuple, - OSTREE_GPG_SIGNATURE_ATTR_KEY_MISSING, - "b", &key_missing); + g_variant_get_child (tuple, OSTREE_GPG_SIGNATURE_ATTR_KEY_MISSING, "b", &key_missing); - g_variant_get_child (tuple, - OSTREE_GPG_SIGNATURE_ATTR_USER_NAME, - "&s", &attr_string); + g_variant_get_child (tuple, OSTREE_GPG_SIGNATURE_ATTR_USER_NAME, "&s", &attr_string); if (key_missing) g_assert_cmpstr (attr_string, ==, "[unknown name]"); else g_assert_cmpstr (attr_string, ==, "J. Random User"); - g_variant_get_child (tuple, - OSTREE_GPG_SIGNATURE_ATTR_USER_EMAIL, - "&s", &attr_string); + g_variant_get_child (tuple, OSTREE_GPG_SIGNATURE_ATTR_USER_EMAIL, "&s", &attr_string); if (key_missing) g_assert_cmpstr (attr_string, ==, "[unknown email]"); else @@ -255,11 +240,10 @@ test_attribute_basics (TestFixture *fixture, } static void -test_valid_signature (TestFixture *fixture, - gconstpointer user_data) +test_valid_signature (TestFixture *fixture, gconstpointer user_data) { guint signature_index = 0; - g_autoptr(GVariant) tuple = NULL; + g_autoptr (GVariant) tuple = NULL; gboolean valid; gboolean sig_expired; gboolean key_expired; @@ -267,17 +251,10 @@ test_valid_signature (TestFixture *fixture, gboolean key_missing; gint64 key_exp_timestamp; - tuple = ostree_gpg_verify_result_get (fixture->result, - signature_index, - some_attributes, + tuple = ostree_gpg_verify_result_get (fixture->result, signature_index, some_attributes, G_N_ELEMENTS (some_attributes)); - g_variant_get (tuple, "(bbbbbx)", - &valid, - &sig_expired, - &key_expired, - &key_revoked, - &key_missing, + g_variant_get (tuple, "(bbbbbx)", &valid, &sig_expired, &key_expired, &key_revoked, &key_missing, &key_exp_timestamp); g_assert_true (valid); @@ -289,11 +266,10 @@ test_valid_signature (TestFixture *fixture, } static void -test_expired_key (TestFixture *fixture, - gconstpointer user_data) +test_expired_key (TestFixture *fixture, gconstpointer user_data) { guint signature_index = 1; - g_autoptr(GVariant) tuple = NULL; + g_autoptr (GVariant) tuple = NULL; gboolean valid; gboolean sig_expired; gboolean key_expired; @@ -301,17 +277,10 @@ test_expired_key (TestFixture *fixture, gboolean key_missing; gint64 key_exp_timestamp; - tuple = ostree_gpg_verify_result_get (fixture->result, - signature_index, - some_attributes, + tuple = ostree_gpg_verify_result_get (fixture->result, signature_index, some_attributes, G_N_ELEMENTS (some_attributes)); - g_variant_get (tuple, "(bbbbbx)", - &valid, - &sig_expired, - &key_expired, - &key_revoked, - &key_missing, + g_variant_get (tuple, "(bbbbbx)", &valid, &sig_expired, &key_expired, &key_revoked, &key_missing, &key_exp_timestamp); g_assert_false (valid); @@ -323,11 +292,10 @@ test_expired_key (TestFixture *fixture, } static void -test_revoked_key (TestFixture *fixture, - gconstpointer user_data) +test_revoked_key (TestFixture *fixture, gconstpointer user_data) { guint signature_index = 2; - g_autoptr(GVariant) tuple = NULL; + g_autoptr (GVariant) tuple = NULL; gboolean valid; gboolean sig_expired; gboolean key_expired; @@ -335,17 +303,10 @@ test_revoked_key (TestFixture *fixture, gboolean key_missing; gint64 key_exp_timestamp; - tuple = ostree_gpg_verify_result_get (fixture->result, - signature_index, - some_attributes, + tuple = ostree_gpg_verify_result_get (fixture->result, signature_index, some_attributes, G_N_ELEMENTS (some_attributes)); - g_variant_get (tuple, "(bbbbbx)", - &valid, - &sig_expired, - &key_expired, - &key_revoked, - &key_missing, + g_variant_get (tuple, "(bbbbbx)", &valid, &sig_expired, &key_expired, &key_revoked, &key_missing, &key_exp_timestamp); g_assert_false (valid); @@ -357,11 +318,10 @@ test_revoked_key (TestFixture *fixture, } static void -test_missing_key (TestFixture *fixture, - gconstpointer user_data) +test_missing_key (TestFixture *fixture, gconstpointer user_data) { guint signature_index = 3; - g_autoptr(GVariant) tuple = NULL; + g_autoptr (GVariant) tuple = NULL; gboolean valid; gboolean sig_expired; gboolean key_expired; @@ -369,17 +329,10 @@ test_missing_key (TestFixture *fixture, gboolean key_missing; gint64 key_exp_timestamp; - tuple = ostree_gpg_verify_result_get (fixture->result, - signature_index, - some_attributes, + tuple = ostree_gpg_verify_result_get (fixture->result, signature_index, some_attributes, G_N_ELEMENTS (some_attributes)); - g_variant_get (tuple, "(bbbbbx)", - &valid, - &sig_expired, - &key_expired, - &key_revoked, - &key_missing, + g_variant_get (tuple, "(bbbbbx)", &valid, &sig_expired, &key_expired, &key_revoked, &key_missing, &key_exp_timestamp); g_assert_false (valid); @@ -391,11 +344,10 @@ test_missing_key (TestFixture *fixture, } static void -test_expired_signature (TestFixture *fixture, - gconstpointer user_data) +test_expired_signature (TestFixture *fixture, gconstpointer user_data) { guint signature_index = 4; - g_autoptr(GVariant) tuple = NULL; + g_autoptr (GVariant) tuple = NULL; gboolean valid; gboolean sig_expired; gboolean key_expired; @@ -403,17 +355,10 @@ test_expired_signature (TestFixture *fixture, gboolean key_missing; gint64 key_exp_timestamp; - tuple = ostree_gpg_verify_result_get (fixture->result, - signature_index, - some_attributes, + tuple = ostree_gpg_verify_result_get (fixture->result, signature_index, some_attributes, G_N_ELEMENTS (some_attributes)); - g_variant_get (tuple, "(bbbbbx)", - &valid, - &sig_expired, - &key_expired, - &key_revoked, - &key_missing, + g_variant_get (tuple, "(bbbbbx)", &valid, &sig_expired, &key_expired, &key_revoked, &key_missing, &key_exp_timestamp); g_assert_false (valid); @@ -425,71 +370,59 @@ test_expired_signature (TestFixture *fixture, } static void -test_require_valid_signature (TestFixture *fixture, - gconstpointer user_data) +test_require_valid_signature (TestFixture *fixture, gconstpointer user_data) { GError *error = NULL; - gboolean res = ostree_gpg_verify_result_require_valid_signature (fixture->result, - &error); + gboolean res = ostree_gpg_verify_result_require_valid_signature (fixture->result, &error); g_assert_true (res); g_assert_no_error (error); } static void -test_require_valid_signature_expired_key (TestFixture *fixture, - gconstpointer user_data) +test_require_valid_signature_expired_key (TestFixture *fixture, gconstpointer user_data) { GError *error = NULL; - gboolean res = ostree_gpg_verify_result_require_valid_signature (fixture->result, - &error); + gboolean res = ostree_gpg_verify_result_require_valid_signature (fixture->result, &error); g_assert_false (res); g_assert_error (error, OSTREE_GPG_ERROR, OSTREE_GPG_ERROR_EXPIRED_KEY); assert_str_contains (error->message, "Key expired"); } static void -test_require_valid_signature_revoked_key (TestFixture *fixture, - gconstpointer user_data) +test_require_valid_signature_revoked_key (TestFixture *fixture, gconstpointer user_data) { GError *error = NULL; - gboolean res = ostree_gpg_verify_result_require_valid_signature (fixture->result, - &error); + gboolean res = ostree_gpg_verify_result_require_valid_signature (fixture->result, &error); g_assert_false (res); g_assert_error (error, OSTREE_GPG_ERROR, OSTREE_GPG_ERROR_REVOKED_KEY); assert_str_contains (error->message, "Key revoked"); } static void -test_require_valid_signature_missing_key (TestFixture *fixture, - gconstpointer user_data) +test_require_valid_signature_missing_key (TestFixture *fixture, gconstpointer user_data) { GError *error = NULL; - gboolean res = ostree_gpg_verify_result_require_valid_signature (fixture->result, - &error); + gboolean res = ostree_gpg_verify_result_require_valid_signature (fixture->result, &error); g_assert_false (res); g_assert_error (error, OSTREE_GPG_ERROR, OSTREE_GPG_ERROR_MISSING_KEY); assert_str_contains (error->message, "public key not found"); } static void -test_require_valid_signature_expired_signature (TestFixture *fixture, - gconstpointer user_data) +test_require_valid_signature_expired_signature (TestFixture *fixture, gconstpointer user_data) { GError *error = NULL; - gboolean res = ostree_gpg_verify_result_require_valid_signature (fixture->result, - &error); + gboolean res = ostree_gpg_verify_result_require_valid_signature (fixture->result, &error); g_assert_false (res); g_assert_error (error, OSTREE_GPG_ERROR, OSTREE_GPG_ERROR_EXPIRED_SIGNATURE); assert_str_contains (error->message, "Signature expired"); } static void -test_require_valid_signature_expired_missing_key (TestFixture *fixture, - gconstpointer user_data) +test_require_valid_signature_expired_missing_key (TestFixture *fixture, gconstpointer user_data) { GError *error = NULL; - gboolean res = ostree_gpg_verify_result_require_valid_signature (fixture->result, - &error); + gboolean res = ostree_gpg_verify_result_require_valid_signature (fixture->result, &error); g_assert_false (res); /* @@ -506,110 +439,59 @@ main (int argc, char **argv) { g_test_init (&argc, &argv, NULL); - (void) gpgme_check_version (NULL); + (void)gpgme_check_version (NULL); - g_test_add ("/gpg-verify-result/check-counts", - TestFixture, - NULL, - test_fixture_setup, - test_check_counts, - test_fixture_teardown); + g_test_add ("/gpg-verify-result/check-counts", TestFixture, NULL, test_fixture_setup, + test_check_counts, test_fixture_teardown); - g_test_add ("/gpg-verify-result/signature-lookup", - TestFixture, - NULL, - test_fixture_setup, - test_signature_lookup, - test_fixture_teardown); + g_test_add ("/gpg-verify-result/signature-lookup", TestFixture, NULL, test_fixture_setup, + test_signature_lookup, test_fixture_teardown); - g_test_add ("/gpg-verify-result/attribute-basics", - TestFixture, - NULL, - test_fixture_setup, - test_attribute_basics, - test_fixture_teardown); + g_test_add ("/gpg-verify-result/attribute-basics", TestFixture, NULL, test_fixture_setup, + test_attribute_basics, test_fixture_teardown); - g_test_add ("/gpg-verify-result/valid-signature", - TestFixture, - NULL, - test_fixture_setup, - test_valid_signature, - test_fixture_teardown); + g_test_add ("/gpg-verify-result/valid-signature", TestFixture, NULL, test_fixture_setup, + test_valid_signature, test_fixture_teardown); - g_test_add ("/gpg-verify-result/expired-key", - TestFixture, - NULL, - test_fixture_setup, - test_expired_key, - test_fixture_teardown); + g_test_add ("/gpg-verify-result/expired-key", TestFixture, NULL, test_fixture_setup, + test_expired_key, test_fixture_teardown); - g_test_add ("/gpg-verify-result/revoked-key", - TestFixture, - NULL, - test_fixture_setup, - test_revoked_key, - test_fixture_teardown); + g_test_add ("/gpg-verify-result/revoked-key", TestFixture, NULL, test_fixture_setup, + test_revoked_key, test_fixture_teardown); - g_test_add ("/gpg-verify-result/missing-key", - TestFixture, - NULL, - test_fixture_setup, - test_missing_key, - test_fixture_teardown); + g_test_add ("/gpg-verify-result/missing-key", TestFixture, NULL, test_fixture_setup, + test_missing_key, test_fixture_teardown); - g_test_add ("/gpg-verify-result/expired-signature", - TestFixture, - NULL, - test_fixture_setup, - test_expired_signature, - test_fixture_teardown); + g_test_add ("/gpg-verify-result/expired-signature", TestFixture, NULL, test_fixture_setup, + test_expired_signature, test_fixture_teardown); - g_test_add ("/gpg-verify-result/require-valid-signature", - TestFixture, - NULL, - test_fixture_setup, - test_require_valid_signature, - test_fixture_teardown); + g_test_add ("/gpg-verify-result/require-valid-signature", TestFixture, NULL, test_fixture_setup, + test_require_valid_signature, test_fixture_teardown); const char *expired_key_files[] = { "lgpl2.sig1", NULL }; - g_test_add ("/gpg-verify-result/require-valid-signature-expired-key", - TestFixture, - expired_key_files, - test_fixture_setup, - test_require_valid_signature_expired_key, + g_test_add ("/gpg-verify-result/require-valid-signature-expired-key", TestFixture, + expired_key_files, test_fixture_setup, test_require_valid_signature_expired_key, test_fixture_teardown); const char *revoked_key_files[] = { "lgpl2.sig2", NULL }; - g_test_add ("/gpg-verify-result/require-valid-signature-revoked-key", - TestFixture, - revoked_key_files, - test_fixture_setup, - test_require_valid_signature_revoked_key, + g_test_add ("/gpg-verify-result/require-valid-signature-revoked-key", TestFixture, + revoked_key_files, test_fixture_setup, test_require_valid_signature_revoked_key, test_fixture_teardown); const char *missing_key_files[] = { "lgpl2.sig3", NULL }; - g_test_add ("/gpg-verify-result/require-valid-signature-missing-key", - TestFixture, - missing_key_files, - test_fixture_setup, - test_require_valid_signature_missing_key, + g_test_add ("/gpg-verify-result/require-valid-signature-missing-key", TestFixture, + missing_key_files, test_fixture_setup, test_require_valid_signature_missing_key, test_fixture_teardown); const char *expired_signature_files[] = { "lgpl2.sig4", NULL }; - g_test_add ("/gpg-verify-result/require-valid-signature-expired-signature", - TestFixture, - expired_signature_files, - test_fixture_setup, - test_require_valid_signature_expired_signature, - test_fixture_teardown); + g_test_add ("/gpg-verify-result/require-valid-signature-expired-signature", TestFixture, + expired_signature_files, test_fixture_setup, + test_require_valid_signature_expired_signature, test_fixture_teardown); const char *expired_missing_key_files[] = { "lgpl2.sig1", "lgpl2.sig3", NULL }; - g_test_add ("/gpg-verify-result/require-valid-signature-expired-missing-key", - TestFixture, - expired_missing_key_files, - test_fixture_setup, - test_require_valid_signature_expired_missing_key, - test_fixture_teardown); + g_test_add ("/gpg-verify-result/require-valid-signature-expired-missing-key", TestFixture, + expired_missing_key_files, test_fixture_setup, + test_require_valid_signature_expired_missing_key, test_fixture_teardown); return g_test_run (); } |