From bdf2c8b6b129b315bae567994c6da1968ac522a0 Mon Sep 17 00:00:00 2001 From: "Dirk-Jan C. Binnema" Date: Mon, 17 Aug 2026 21:25:54 +0300 Subject: [PATCH] tests: avoid build warning Check all the functions that return a Result. --- lib/mu-contacts-cache.cc | 18 +++++++++--------- lib/mu-query-xapianizer.cc | 2 +- lib/tests/test-mu-store-query.cc | 8 +++++--- lib/tests/test-mu-store.cc | 10 +++++----- mu/mu-cmd-add.cc | 4 ++-- mu/mu-cmd-remove.cc | 2 +- 6 files changed, 23 insertions(+), 21 deletions(-) diff --git a/lib/mu-contacts-cache.cc b/lib/mu-contacts-cache.cc index c0831877..c65bf78b 100644 --- a/lib/mu-contacts-cache.cc +++ b/lib/mu-contacts-cache.cc @@ -440,8 +440,8 @@ test_mu_contacts_cache_personal() { MemDb xdb{}; Config cdb{xdb}; - cdb.set - (StringVec{{"foo@example.com", "bar@cuux.org", "/bar-.*@fnorb.f./"}}); + assert_valid_result(cdb.set + (StringVec{{"foo@example.com", "bar@cuux.org", "/bar-.*@fnorb.f./"}})); ContactsCache contacts{cdb}; g_assert_true(contacts.is_personal("foo@example.com")); @@ -460,8 +460,8 @@ test_mu_contacts_cache_ignored() { MemDb xdb{}; Config cdb{xdb}; - cdb.set - (StringVec{{"foo@example.com", "bar@cuux.org", "/bar-.*@fnorb.f./"}}); + assert_valid_result(cdb.set + (StringVec{{"foo@example.com", "bar@cuux.org", "/bar-.*@fnorb.f./"}})); ContactsCache contacts{cdb}; g_assert_true(contacts.is_ignored("foo@example.com")); @@ -500,7 +500,7 @@ test_mu_contacts_cache_foreach() size_t n{}; g_assert_false(ccache.empty()); g_assert_cmpuint(ccache.size(),==,2); - ccache.for_each([&](auto&& contact) { ++n; return false; }); + assert_valid_result(ccache.for_each([&](auto&& contact) { ++n; return false; })); g_assert_cmpuint(n,==,1); } @@ -508,7 +508,7 @@ test_mu_contacts_cache_foreach() size_t n{}; g_assert_false(ccache.empty()); g_assert_cmpuint(ccache.size(),==,2); - ccache.for_each([&](auto&& contact) { ++n; return true; }); + assert_valid_result(ccache.for_each([&](auto&& contact) { ++n; return true; })); g_assert_cmpuint(n,==,2); } @@ -517,7 +517,7 @@ test_mu_contacts_cache_foreach() ccache.clear(); g_assert_true(ccache.empty()); g_assert_cmpuint(ccache.size(),==,0); - ccache.for_each([&](auto&& contact) { ++n; return true; }); + assert_valid_result(ccache.for_each([&](auto&& contact) { ++n; return true; })); g_assert_cmpuint(n,==,0); } } @@ -530,12 +530,12 @@ test_mu_contacts_cache_sort() if (g_test_verbose()) fmt::print("contacts-cache:\n"); - ccache.for_each([&](auto&& contact) { + assert_valid_result(ccache.for_each([&](auto&& contact) { if (g_test_verbose()) fmt::print("\t- {}\n", contact.display_name()); str += contact.name; return true; - }); + })); return str; }; diff --git a/lib/mu-query-xapianizer.cc b/lib/mu-query-xapianizer.cc index c46fbcbf..43072acb 100644 --- a/lib/mu-query-xapianizer.cc +++ b/lib/mu-query-xapianizer.cc @@ -508,7 +508,7 @@ test_xapian() assert_equal(xq->get_description(), test.second); } - remove_directory(testhome); + assert_valid_result(remove_directory(testhome)); } int diff --git a/lib/tests/test-mu-store-query.cc b/lib/tests/test-mu-store-query.cc index 54b0ad73..478a2c57 100644 --- a/lib/tests/test-mu-store-query.cc +++ b/lib/tests/test-mu-store-query.cc @@ -1043,7 +1043,7 @@ https://trac.xapian.org/ticket/719 MemDb mdb; Config conf{mdb}; - conf.set(true); + assert_valid_result(conf.set(true)); TempDir tdir; auto store{make_test_store(tdir.path(), test_msgs, conf)}; @@ -1113,11 +1113,13 @@ Boo! g_assert_true(msg.sexp().to_string().find("shrike") == std::string::npos); - store.update_labels(msg, Labels::parse_delta_labels("+shrike"," ").value()); + assert_valid_result(store.update_labels( + msg, Labels::parse_delta_labels("+shrike"," ").value())); g_assert_true(msg.sexp().to_string().find("shrike") != std::string::npos); - store.update_labels(msg, Labels::parse_delta_labels("-shrike"," ").value()); + assert_valid_result(store.update_labels( + msg, Labels::parse_delta_labels("-shrike"," ").value())); g_assert_true(msg.sexp().to_string().find("shrike") == std::string::npos); } diff --git a/lib/tests/test-mu-store.cc b/lib/tests/test-mu-store.cc index 409abb72..cb531291 100644 --- a/lib/tests/test-mu-store.cc +++ b/lib/tests/test-mu-store.cc @@ -64,10 +64,10 @@ test_store_reinit() { MemDb mdb; Config conf{mdb}; - conf.set(1234567); - conf.set(7654321); - conf.set( - StringVec{ "foo@example.com", "bar@example.com" }); + assert_valid_result(conf.set(1234567)); + assert_valid_result(conf.set(7654321)); + assert_valid_result(conf.set( + StringVec{ "foo@example.com", "bar@example.com" })); auto store{Store::make_new(tempdir.path(), MuTestMaildir, conf)}; assert_valid_result(store); @@ -581,7 +581,7 @@ test_store_circular_symlink() // there will be a lot of dups.... g_assert_false(store.empty()); - remove_directory(testhome); + assert_valid_result(remove_directory(testhome)); } static void diff --git a/mu/mu-cmd-add.cc b/mu/mu-cmd-add.cc index 46dcf9ad..70167d21 100644 --- a/mu/mu-cmd-add.cc +++ b/mu/mu-cmd-add.cc @@ -80,7 +80,7 @@ test_add_ok() } - remove_directory(testhome); + assert_valid_result(remove_directory(testhome)); } static void @@ -108,7 +108,7 @@ test_add_fail() g_assert_cmpuint(res->exit_code,!=,0); } - remove_directory(testhome); + assert_valid_result(remove_directory(testhome)); } diff --git a/mu/mu-cmd-remove.cc b/mu/mu-cmd-remove.cc index 5eb96b83..a5fa06e2 100644 --- a/mu/mu-cmd-remove.cc +++ b/mu/mu-cmd-remove.cc @@ -77,7 +77,7 @@ test_remove_ok() g_assert_cmpuint(::access(testmsg.c_str(), F_OK), ==, 0); } - remove_directory(testhome); + assert_valid_result(remove_directory(testhome)); }