[PATCH 1/1] maintenance: fix test t7900-maintenance.sh

From: Lénaïc Huard <lenaic@lhuard.fr>
Date: Sep 27, 2021, 21:30 UTC
Message-ID: <20210927213016.21714-2-lenaic@lhuard.fr>
In-Reply-To: <20210927213016.21714-1-lenaic@lhuard.fr>

Commit b681b191 introduced the support of systemd timers for git maintenance. A test is leveraging the `systemd-analyze verify` utility to verify the correctness of the systemd unit files generated by git.

But on some systems, although the `systemd-analyze` tool is installed and supports the `verify` subcommand, it fails with some permission errors.

So, instead of only checking if the `verify` subcommand exists, a more reliable way of detecting whether `systemd-analyze verify` can be used is to try to use it.

The SYSTEMD_ANALYZE prerequisite is now trying to run `systemd-analyze verify` on a systemd unit file which is shipped by systemd itself. We can reasonably think that, on systemd hosts, this file is present and valid.

Signed-off-by: Lénaïc Huard <lenaic@lhuard.fr>
---
 t/t7900-maintenance.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/t/t7900-maintenance.sh b/t/t7900-maintenance.sh
index 36a4218745..6b4941980c 100755
--- a/t/t7900-maintenance.sh
+++ b/t/t7900-maintenance.sh
@@ -21,8 +21,7 @@ test_xmllint () {
 }
 
 test_lazy_prereq SYSTEMD_ANALYZE '
-	systemd-analyze --help >out &&
-	grep verify out
+	systemd-analyze verify /lib/systemd/system/basic.target
 '
 
 test_systemd_analyze_verify () {

-- 
2.33.0