From: Nick Rosbrook <nick.rosbrook@canonical.com>
Date: Tue, 13 Dec 2022 17:22:37 +0000 (-0500)
Subject: test-unit-name: simplify machine-id check
X-Git-Tag: v253-rc1~281^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a635b6279cf35abad3abe169780ec899df9396df;p=thirdparty%2Fsystemd.git

test-unit-name: simplify machine-id check
---

diff --git a/src/test/test-unit-name.c b/src/test/test-unit-name.c
index 98fffc7c87e..c6428e844f8 100644
--- a/src/test/test-unit-name.c
+++ b/src/test/test-unit-name.c
@@ -3,6 +3,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#include "sd-id128.h"
+
 #include "alloc-util.h"
 #include "all-units.h"
 #include "glob-util.h"
@@ -261,7 +263,7 @@ TEST_RET(unit_printf, .sd_booted = true) {
         assert_se(short_hostname);
         assert_se(specifier_pretty_hostname('q', NULL, NULL, NULL, &pretty_hostname) == 0);
         assert_se(pretty_hostname);
-        if (access("/etc/machine-id", F_OK) >= 0) {
+        if (sd_id128_get_machine(NULL) >= 0) {
                 assert_se(specifier_machine_id('m', NULL, NULL, NULL, &machine_id) >= 0);
                 assert_se(machine_id);
         }