Skip to content

tests: check for errnos that sd_id128_get_machine actually returns #119

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 2 commits into from
Aug 17, 2022
Merged

tests: check for errnos that sd_id128_get_machine actually returns #119

merged 2 commits into from
Aug 17, 2022

Conversation

@keszybz
Copy link
Member

@keszybz keszybz commented Aug 17, 2022

Fixes #118.
bluca
bluca reviewed Aug 17, 2022
View reviewed changes
systemd/test/test_id128.py Outdated
a2 = uuid.uuid1()

with skip_oserror(errno.ENOSYS):
# yikes, python2 doesn't know ENOMEDIUM
Copy link
Member

@bluca bluca Aug 17, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Given the other PR, maybe merge it first and use enomedium here?
Copy link
Member Author

@keszybz keszybz Aug 17, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I want this patch to be backportable without conflicts… This workaround an be dropped later.
@mrc0mmand
Copy link
Member

mrc0mmand commented Aug 17, 2022

Since initializing /etc/machine-id for the tests to pass shouldn't be necessary anymore, can you drop

python-systemd/.github/workflows/install.yml

Lines 79 to 80 in dc1dae2

# Initialize /etc/machine-id if it's empty to make the tests happy
[[ ! -s /etc/machine-id ]] && systemd-id128 new >/etc/machine-id
from the CI stuff?
@keszybz
Copy link
Member Author

keszybz commented Aug 17, 2022

OK, the tests pass, and with the second commit, we know that we're testing without machine-id, so I'm pretty sure this resolved the original issue.
@keszybz keszybz merged commit 661ee27 into systemd:main Aug 17, 2022
@keszybz keszybz deleted the sd128-tests branch August 17, 2022 11:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

3 participants

@keszybz @mrc0mmand @bluca