From 3bdcf24b28c2d83dddb9b40cc64bc5f8ec7a7d10 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Wed, 26 Feb 2025 19:20:00 +0000 Subject: [PATCH] test-gpg-verify-result: Show what the result was before asserting about it Helps: https://github.com/ostreedev/ostree/issues/3386 Signed-off-by: Simon McVittie --- tests/test-gpg-verify-result.c | 38 ++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/tests/test-gpg-verify-result.c b/tests/test-gpg-verify-result.c index 5844c668d2..bfa3759659 100644 --- a/tests/test-gpg-verify-result.c +++ b/tests/test-gpg-verify-result.c @@ -211,6 +211,8 @@ test_attribute_basics (TestFixture *fixture, gconstpointer user_data) gboolean key_missing; tuple = ostree_gpg_verify_result_get_all (fixture->result, ii); + g_autofree gchar *pretty = g_variant_print (tuple, TRUE); + g_test_message ("Signature #%u: %s", ii, pretty); type_string = g_variant_get_type_string (tuple); g_assert_cmpstr (type_string, ==, "(bbbbbsxxsssssxx)"); @@ -257,6 +259,12 @@ test_valid_signature (TestFixture *fixture, gconstpointer user_data) g_variant_get (tuple, "(bbbbbx)", &valid, &sig_expired, &key_expired, &key_revoked, &key_missing, &key_exp_timestamp); + g_test_message ("Verify result (should be valid): " + "valid=%c sig_expired=%c key_expired=%c key_revoked=%c " + "key_missing=%c key_exp_timestamp=%" G_GINT64_FORMAT, + valid ? 'y' : 'n', sig_expired ? 'y' : 'n', key_expired ? 'y' : 'n', + key_revoked ? 'y' : 'n', key_missing ? 'y' : 'n', key_exp_timestamp); + g_assert_true (valid); g_assert_false (sig_expired); g_assert_false (key_expired); @@ -283,6 +291,12 @@ test_expired_key (TestFixture *fixture, gconstpointer user_data) g_variant_get (tuple, "(bbbbbx)", &valid, &sig_expired, &key_expired, &key_revoked, &key_missing, &key_exp_timestamp); + g_test_message ("Verify result (should be expired): " + "valid=%c sig_expired=%c key_expired=%c key_revoked=%c " + "key_missing=%c key_exp_timestamp=%" G_GINT64_FORMAT, + valid ? 'y' : 'n', sig_expired ? 'y' : 'n', key_expired ? 'y' : 'n', + key_revoked ? 'y' : 'n', key_missing ? 'y' : 'n', key_exp_timestamp); + g_assert_false (valid); g_assert_false (sig_expired); g_assert_true (key_expired); @@ -309,6 +323,12 @@ test_revoked_key (TestFixture *fixture, gconstpointer user_data) g_variant_get (tuple, "(bbbbbx)", &valid, &sig_expired, &key_expired, &key_revoked, &key_missing, &key_exp_timestamp); + g_test_message ("Verify result (should be revoked): " + "valid=%c sig_expired=%c key_expired=%c key_revoked=%c " + "key_missing=%c key_exp_timestamp=%" G_GINT64_FORMAT, + valid ? 'y' : 'n', sig_expired ? 'y' : 'n', key_expired ? 'y' : 'n', + key_revoked ? 'y' : 'n', key_missing ? 'y' : 'n', key_exp_timestamp); + g_assert_false (valid); g_assert_false (sig_expired); g_assert_false (key_expired); @@ -335,6 +355,12 @@ test_missing_key (TestFixture *fixture, gconstpointer user_data) g_variant_get (tuple, "(bbbbbx)", &valid, &sig_expired, &key_expired, &key_revoked, &key_missing, &key_exp_timestamp); + g_test_message ("Verify result (should be missing): " + "valid=%c sig_expired=%c key_expired=%c key_revoked=%c " + "key_missing=%c key_exp_timestamp=%" G_GINT64_FORMAT, + valid ? 'y' : 'n', sig_expired ? 'y' : 'n', key_expired ? 'y' : 'n', + key_revoked ? 'y' : 'n', key_missing ? 'y' : 'n', key_exp_timestamp); + g_assert_false (valid); g_assert_false (sig_expired); g_assert_false (key_expired); @@ -361,6 +387,12 @@ test_expired_signature (TestFixture *fixture, gconstpointer user_data) g_variant_get (tuple, "(bbbbbx)", &valid, &sig_expired, &key_expired, &key_revoked, &key_missing, &key_exp_timestamp); + g_test_message ("Verify result (should be expired sig): " + "valid=%c sig_expired=%c key_expired=%c key_revoked=%c " + "key_missing=%c key_exp_timestamp=%" G_GINT64_FORMAT, + valid ? 'y' : 'n', sig_expired ? 'y' : 'n', key_expired ? 'y' : 'n', + key_revoked ? 'y' : 'n', key_missing ? 'y' : 'n', key_exp_timestamp); + g_assert_false (valid); g_assert_true (sig_expired); g_assert_false (key_expired); @@ -384,6 +416,8 @@ test_require_valid_signature_expired_key (TestFixture *fixture, gconstpointer us GError *error = NULL; gboolean res = ostree_gpg_verify_result_require_valid_signature (fixture->result, &error); g_assert_false (res); + g_test_message ("Expected expired key, got: %s %d %s", g_quark_to_string (error->domain), + error->code, error->message); g_assert_error (error, OSTREE_GPG_ERROR, OSTREE_GPG_ERROR_EXPIRED_KEY); assert_str_contains (error->message, "Key expired"); } @@ -394,6 +428,8 @@ test_require_valid_signature_revoked_key (TestFixture *fixture, gconstpointer us GError *error = NULL; gboolean res = ostree_gpg_verify_result_require_valid_signature (fixture->result, &error); g_assert_false (res); + g_test_message ("Expected revoked key, got: %s %d %s", g_quark_to_string (error->domain), + error->code, error->message); g_assert_error (error, OSTREE_GPG_ERROR, OSTREE_GPG_ERROR_REVOKED_KEY); assert_str_contains (error->message, "Key revoked"); } @@ -424,6 +460,8 @@ test_require_valid_signature_expired_missing_key (TestFixture *fixture, gconstpo GError *error = NULL; gboolean res = ostree_gpg_verify_result_require_valid_signature (fixture->result, &error); g_assert_false (res); + g_test_message ("Expected expired and missing key, got: %s %d %s", + g_quark_to_string (error->domain), error->code, error->message); /* * The error will be for the last signature, which is for a missing key, but