From d2f5a0476f37973d2027029662f41413d2d8e243 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Tue, 21 Dec 2021 14:24:03 -0500 Subject: tests: Fix clang-analyzer not seeing through `g_error()` Basically due to the glib structured logging rework we lost the `noreturn` attribute on `g_error()`. This is fixed in glib as of https://gitlab.gnome.org/GNOME/glib/-/commit/f97ff20adf4eb7b952dd83e2c13046fe9e282f50 But we might as well just throw an error here. --- tests/test-commit-sign-sh-ext.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/test-commit-sign-sh-ext.c b/tests/test-commit-sign-sh-ext.c index dee22573..6dc287d9 100644 --- a/tests/test-commit-sign-sh-ext.c +++ b/tests/test-commit-sign-sh-ext.c @@ -80,26 +80,26 @@ run (GError **error) if (ostree_repo_signature_verify_commit_data (repo, "origin", commit_bytes, detached_meta_bytes, OSTREE_REPO_VERIFY_FLAGS_NO_GPG | OSTREE_REPO_VERIFY_FLAGS_NO_SIGNAPI, &verify_report, error)) - g_error ("Should not have validated"); + return glnx_throw (error, "Should not have validated"); assert_error_contains (error, "No commit verification types enabled"); // No signatures g_autoptr(GBytes) empty = g_bytes_new_static ("", 0); if (ostree_repo_signature_verify_commit_data (repo, "origin", commit_bytes, empty, 0, &verify_report, error)) - g_error ("Should not have validated"); + return glnx_throw (error, "Should not have validated"); assert_error_contains (error, "no signatures found"); // No such remote if (ostree_repo_signature_verify_commit_data (repo, "nosuchremote", commit_bytes, detached_meta_bytes, 0, &verify_report, error)) - g_error ("Should not have validated"); + return glnx_throw (error, "Should not have validated"); assert_error_contains (error, "Remote \"nosuchremote\" not found"); // Corrupted commit g_autoptr(GBytes) corrupted_commit = corrupt (commit_bytes); if (ostree_repo_signature_verify_commit_data (repo, "origin", corrupted_commit, detached_meta_bytes, 0, &verify_report, error)) - g_error ("Should not have validated"); + return glnx_throw (error, "Should not have validated"); assert_error_contains (error, "BAD signature"); return TRUE; -- cgit v1.2.1