particle-os/debian-forge
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

osbuild: fix error match in mount test for rawhide

Browse source 
Latest util-linux mount uses fsconfig(2) instead of mount(2) so the
error is different.

See https://artifacts.dev.testing-farm.io/53b552b6-5753-47e2-9cd0-43fa8b6e5f9f/

Closes: https://github.com/osbuild/osbuild/issues/1753
This commit is contained in:
Michael Vogt 2024-04-25 09:10:22 +02:00 • committed by Achilleas Koutsou
parent 59bff6d742
commit 4a51bafa46
1 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
test/mod/test_util_mnt.py
View file

@ -1,4 +1,5 @@
import os
import re
import pytest
@ -10,7 +11,9 @@ from osbuild.util.mnt import MountGuard, mount
def test_mount_failure_msg(tmp_path):
with pytest.raises(RuntimeError) as e:
mount("/dev/invalid-src", tmp_path)
assert "special device /dev/invalid-src does not exist" in str(e.value)
# latest util-linux mount uses fsconfig(2) instead of mount(2) so the
# error is different
assert re.search(r"special device /dev/invalid-src does not exist|Can't lookup blockdev.", str(e.value))
@pytest.mark.skipif(os.getuid() != 0, reason="root only")
@ -18,7 +21,9 @@ def test_mount_guard_failure_msg(tmp_path):
with pytest.raises(RuntimeError) as e:
with MountGuard() as mg:
mg.mount("/dev/invalid-src", tmp_path)
assert "special device /dev/invalid-src does not exist" in str(e.value)
# latest util-linux mount uses fsconfig(2) instead of mount(2) so the
# error is different
assert re.search(r"special device /dev/invalid-src does not exist|Can't lookup blockdev.", str(e.value))
@pytest.mark.skipif(os.getuid() != 0, reason="root only")