tests: avoid some ci test problems

Author: djcb

.github/workflows/build-and-test.yml

@@ -37,7 +37,7 @@ jobs:
       - if: startsWith(matrix.container, 'fedora')
         name: fedora-deps
         run: |
-          dnf install -y git make gcc-c++ meson ninja-build pkgconf-pkg-config xapian-core-devel glib2-devel gmime30-devel cli11-devel fmt-devel expected-devel guile30-devel cld2-devel emacs texinfo
+          dnf install -y git make gcc-c++ glibc-gconv-extra gnupg2 meson ninja-build pkgconf-pkg-config xapian-core-devel glib2-devel gmime30-devel cli11-devel fmt-devel expected-devel guile30-devel cld2-devel emacs texinfo
 
       - if: startsWith(matrix.container, 'debian')
         name: debian-deps

lib/message/test-mu-message.cc

@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 2023-2025 Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>
+** Copyright (C) 2023-2026 Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>
 **
 ** This program is free software; you can redistribute it and/or modify it
 ** under the terms of the GNU General Public License as published by the

lib/mu-query-xapianizer.cc

@@ -462,7 +462,10 @@ test_xapian()
 {
 	allow_warnings();
 
-	auto&& testhome{unwrap(make_temp_dir())};
+	// tempdir must outlive the store; the store's dtor still writes
+	// to the database.
+	TempDir tempdir;
+	const auto& testhome{tempdir.path()};
 	auto&& dbpath{runtime_path(RuntimePath::XapianDb, testhome)};
 	auto&& store{unwrap(Store::make_new(dbpath, join_paths(testhome, "test-maildir")))};
 
@@ -514,8 +517,6 @@ test_xapian()
 		assert_valid_result(xq);
 		assert_equal(xq->get_description(), test.second);
 	}
-
-	assert_valid_result(remove_directory(testhome));
 }
 
 int

lib/tests/test-mu-store.cc

@@ -348,12 +348,13 @@ World!
 	//	g_message(">>> %s", (*term).c_str());
 
 	// last-change is recorded as part of a commit.
+	const auto before_commit{::time({})};
 	store->xapian_db().request_commit(true/*force*/);
 
 	const auto stats{store->statistics()};
 	g_assert_cmpuint(stats.size,==,store->size());
 	g_assert_cmpuint(stats.last_index,==,0);
-	g_assert_cmpuint(stats.last_change,>=,::time({}));
+	g_assert_cmpuint(stats.last_change,>=,before_commit);
 }
 
 
@@ -557,7 +558,10 @@ test_store_circular_symlink()
 
 	mu_test_skip_valgrind_return();
 
-	auto testhome{unwrap(make_temp_dir())};
+	// tempdir must outlive the store; the store's dtor still writes
+	// to the database.
+	TempDir tempdir;
+	const auto& testhome{tempdir.path()};
 	auto dbpath{runtime_path(RuntimePath::XapianDb, testhome)};
 
 	/* create a writable copy */
@@ -580,8 +584,6 @@ test_store_circular_symlink()
 	}
 	// there will be a lot of dups....
 	g_assert_false(store.empty());
-
-	assert_valid_result(remove_directory(testhome));
 }
 
 static void

lib/utils/mu-test-utils.cc

@@ -90,7 +90,8 @@ black_hole(void)
 void
 Mu::mu_test_init(int *argc, char ***argv)
 {
-	TempDir temp_dir;
+	// static, so it lives until exit (and gets cleaned up then)
+	static TempDir temp_dir;
 
 	g_unsetenv("XAPIAN_CJK_NGRAM");
 	g_setenv("MU_TEST", "yes", TRUE);

lib/utils/mu-utils-file.cc

@@ -127,9 +127,19 @@ Mu::remove_directory(const std::string& path)
 	if (!check_dir(path, false, true))
 		return Err(Error::Code::File, "not a writable directory: {}", path);
 
+	// some other process may remove entries while we're at it (e.g. a
+	// gpg-agent cleaning up its sockets when its homedir disappears), so
+	// retry a few times when we hit ENOENT.
 	std::error_code err{};
-	const auto n{std::filesystem::remove_all(path, err)};
-	if (err)
+	std::uintmax_t n{};
+	for (auto attempt = 0; attempt != 5; ++attempt) {
+		err.clear();
+		n = std::filesystem::remove_all(path, err);
+		if (err != std::errc::no_such_file_or_directory)
+			break;
+	}
+	if (err && (err != std::errc::no_such_file_or_directory ||
+		    std::filesystem::exists(path)))
 		return Err(Error::Code::File, "failed to remove {}: {}",
 			   path, err.message());