From 8f84fbe8c2bdcea957829cd903f0c9dc62cefaed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Wed, 17 Aug 2022 09:53:25 +0200 Subject: tests: check for errnos that sd_id128_get_machine actually returns Fixes #118. --- systemd/test/test_id128.py | 11 +++++++---- systemd/test/test_journal.py | 6 +++++- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/systemd/test/test_id128.py b/systemd/test/test_id128.py index 146ec73..e87b1cc 100644 --- a/systemd/test/test_id128.py +++ b/systemd/test/test_id128.py @@ -6,11 +6,11 @@ import pytest from systemd import id128 @contextlib.contextmanager -def skip_oserror(code): +def skip_oserror(*errnos): try: yield except (OSError, IOError) as e: - if e.errno == code: + if e.errno in errnos: pytest.skip() raise @@ -21,7 +21,10 @@ def test_randomize(): assert u1 != u2 def test_get_machine(): - u1 = id128.get_machine() + # yikes, python2 doesn't know ENOMEDIUM + with skip_oserror(errno.ENOENT, errno.ENOSYS, 123): + u1 = id128.get_machine() + u2 = id128.get_machine() assert u1 == u2 @@ -29,7 +32,7 @@ def test_get_machine_app_specific(): a1 = uuid.uuid1() a2 = uuid.uuid1() - with skip_oserror(errno.ENOSYS): + with skip_oserror(errno.ENOENT, errno.ENOSYS, 123): u1 = id128.get_machine_app_specific(a1) u2 = id128.get_machine_app_specific(a2) diff --git a/systemd/test/test_journal.py b/systemd/test/test_journal.py index c192136..dd733cf 100644 --- a/systemd/test/test_journal.py +++ b/systemd/test/test_journal.py @@ -233,7 +233,11 @@ def test_reader_this_boot(tmpdir): def test_reader_this_machine(tmpdir): j = journal.Reader(path=tmpdir.strpath) with j: - j.this_machine() + try: + j.this_machine() + except OSError: + pass + j.this_machine(TEST_MID) j.this_machine(TEST_MID.hex) -- cgit v1.2.1