diff options
| author | Nick Rosbrook <nick.rosbrook@canonical.com> | 2022-12-12 14:35:08 -0500 |
|---|---|---|
| committer | Nick Rosbrook <nick.rosbrook@canonical.com> | 2022-12-14 13:58:12 -0500 |
| commit | 415eb50570744daf2257fc6fc96e2d5750532785 (patch) | |
| tree | 20c010e7cac513d584a7e93fbfea283b79082e53 | |
| parent | 5c6c587ce24096d36826418b5390599d1e5ad55c (diff) | |
| download | systemd-415eb50570744daf2257fc6fc96e2d5750532785.tar.gz | |
test-id128: simplify machine-id check
This also ensures that the test is skipped when /etc/machine-id exists,
but is not initialized.
| -rw-r--r-- | src/test/test-id128.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/test/test-id128.c b/src/test/test-id128.c index b7a9b03403..afdbf1e4b9 100644 --- a/src/test/test-id128.c +++ b/src/test/test-id128.c @@ -38,7 +38,7 @@ TEST(id128) { assert_se(!sd_id128_in_set(id, ID128_WALDI)); assert_se(!sd_id128_in_set(id, ID128_WALDI, ID128_WALDI)); - if (sd_booted() > 0 && access("/etc/machine-id", F_OK) >= 0) { + if (sd_booted() > 0 && sd_id128_get_machine(NULL) >= 0) { assert_se(sd_id128_get_machine(&id) == 0); printf("machine: %s\n", sd_id128_to_string(id, t)); @@ -170,7 +170,7 @@ TEST(id128) { assert_se(lseek(fd, 0, SEEK_SET) == 0); assert_se(id128_read_fd(fd, ID128_FORMAT_ANY, NULL) == -EUCLEAN); - if (sd_booted() > 0 && access("/etc/machine-id", F_OK) >= 0) { + if (sd_booted() > 0 && sd_id128_get_machine(NULL) >= 0) { assert_se(sd_id128_get_machine_app_specific(SD_ID128_MAKE(f0,3d,aa,eb,1c,33,4b,43,a7,32,17,29,44,bf,77,2e), &id) >= 0); assert_se(sd_id128_get_machine_app_specific(SD_ID128_MAKE(f0,3d,aa,eb,1c,33,4b,43,a7,32,17,29,44,bf,77,2e), &id2) >= 0); assert_se(sd_id128_equal(id, id2)); @@ -195,8 +195,8 @@ TEST(benchmark_sd_id128_get_machine_app_specific) { unsigned iterations = slow_tests_enabled() ? 1000000 : 1000; usec_t t, q; - if (access("/etc/machine-id", F_OK) < 0 && errno == ENOENT) - return (void) log_tests_skipped("/etc/machine-id does not exist"); + if (sd_id128_get_machine(NULL) < 0) + return (void) log_tests_skipped("/etc/machine-id is not initialized"); log_info("/* %s (%u iterations) */", __func__, iterations); |