tests/vmcheck/misc-2: Update error message to grep for

For some reason, in f34 the error that libostree gets now when trying to
checkout a file on top of an existing one with different content is no
longer EEXIST but EPERM.

Likely due to a change in the kernel or glibc though some quick googling
doesn't reveal anything.
This commit is contained in:
Jonathan Lebon 2021-05-04 15:58:14 -04:00
parent 7ece1846c0
commit 7f19930916

View File

@ -202,7 +202,8 @@ if vm_rpmostree install conflict-pkg 2>err.txt; then
assert_not_reached "Install packages with conflicting files unexpected succeeded" assert_not_reached "Install packages with conflicting files unexpected succeeded"
fi fi
assert_not_file_has_content err.txt "Writing rpmdb" assert_not_file_has_content err.txt "Writing rpmdb"
assert_file_has_content err.txt "File exists" # this used to trigger EEXIST, but in f34 changed to EPERM
assert_file_has_content err.txt "Operation not permitted"
echo "ok detecting file name conflicts before writing rpmdb" echo "ok detecting file name conflicts before writing rpmdb"
# check that the way we detect deployment changes is not dependent on pending-* # check that the way we detect deployment changes is not dependent on pending-*