diff --git a/tests/vmcheck/test-misc-2.sh b/tests/vmcheck/test-misc-2.sh index b6db355f..6867e4f6 100755 --- a/tests/vmcheck/test-misc-2.sh +++ b/tests/vmcheck/test-misc-2.sh @@ -202,7 +202,8 @@ if vm_rpmostree install conflict-pkg 2>err.txt; then assert_not_reached "Install packages with conflicting files unexpected succeeded" fi 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" # check that the way we detect deployment changes is not dependent on pending-* diff --git a/tests/vmcheck/test-override-kernel.sh b/tests/vmcheck/test-override-kernel.sh index e968f14f..a2232543 100755 --- a/tests/vmcheck/test-override-kernel.sh +++ b/tests/vmcheck/test-override-kernel.sh @@ -44,6 +44,7 @@ case $versionid in 31) kernel_release=5.3.7-301.fc31.x86_64;; 32) kernel_release=5.6.6-300.fc32.x86_64;; 33) kernel_release=5.8.15-301.fc33.x86_64;; + 34) kernel_release=5.11.12-300.fc34.x86_64;; *) assert_not_reached "Unsupported Fedora version: $versionid";; esac assert_not_file_has_content current-dblist.txt $kernel_release