From 7ece1846c0659f75da1e09b7986b1f0ebb0a7d4f Mon Sep 17 00:00:00 2001 From: Luca BRUNO Date: Tue, 4 May 2021 12:08:08 +0000 Subject: [PATCH 1/2] tests/override-kernel: add f34 kernel This adds support for Fedora 34. --- tests/vmcheck/test-override-kernel.sh | 1 + 1 file changed, 1 insertion(+) 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 From 7f1993091635f85e644f99b9a7eb4f2967942bbb Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Tue, 4 May 2021 15:58:14 -0400 Subject: [PATCH 2/2] 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. --- tests/vmcheck/test-misc-2.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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-*