unit tests: do not fail when /etc/machine-id is empty
#25732
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
github-actions
bot
added
the
please-review
bluca
reviewed
Dec 13, 2022
yuwata
requested changes
Dec 14, 2022
yuwata
added
reviewed/needs-rework 🔨
This also ensures that the test is skipped when /etc/machine-id exists, but is not initialized.
…nitialized The part of test_chase_symlink in test-fs-util that calls sd_id128_get_machine will fail if /etc/machine-id is empty, so skip this block if the machine-id is not initialized.
When executed on a systemd with an empty /etc/machine-id, test-journal-interleaving fails in test_sequence_numbers_one() when re-opening the existing "two.journal". This is because opening the existing journal file with managed_journal_file_open() causes journal_file_verify_header() to be called. This function tries to compare the current machine-id to the machine-id in the journal file header, but does not handle the case where the machine-id is empty or non-existent. Check if we have an initialized machine-id before executing this portion of the test.
enr0n
force-pushed
the
unit-test-machine-id-initialized
branch
from
3ab5a48
to
3a9ca23
Compare
github-actions
bot
added
journal
please-review
|
I dropped the |
yuwata
approved these changes
Dec 14, 2022
yuwata
added
good-to-merge/waiting-for-ci 👍
keszybz
removed
the
good-to-merge/waiting-for-ci 👍
jackpot51
pushed a commit
to pop-os/systemd
that referenced
this pull request
May 7, 2024
…itialized.patch The latest stable tag includes some, but not all patches which [1] needs to work correctly. For now, just simplify the `machine_id_initialized()` helper and make a note in the patch that the changes were forwarded upstream. [1] systemd/systemd#25732
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is sort of a follow on to #25120, since some of these tests also fail when
/etc/machine-idexists, but is empty. To simplify these checks, add a new test helpermachine_id_initialized()which covers the cases when/etc/machine-idis empty, non-existent, or contains"uninitialized".For one test failure (
test-journal-interleaving), it seemed the appropriate resolution was to actually patch the source. The rest of the changes are in unit tests that should be at least partially skipped when/etc/machine-idhas not been initialized.