keremet/rpm-ostree
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #2807 from lucab/ups/tests-override-kernel-f34

Browse Source 
tests/override-kernel: add f34 kernel
This commit is contained in:
Jonathan Lebon 2021-05-05 09:58:22 -04:00 committed by GitHub
commit 7fe133b6d8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/vmcheck/test-misc-2.sh
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-*

1
tests/vmcheck/test-override-kernel.sh
View File

@ -44,6 +44,7 @@ case $versionid in
31) kernel_release=5.3.7-301.fc31.x86_64;; 31) kernel_release=5.3.7-301.fc31.x86_64;;
32) kernel_release=5.6.6-300.fc32.x86_64;; 32) kernel_release=5.6.6-300.fc32.x86_64;;
33) kernel_release=5.8.15-301.fc33.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";; *) assert_not_reached "Unsupported Fedora version: $versionid";;
esac esac
assert_not_file_has_content current-dblist.txt $kernel_release assert_not_file_has_content current-dblist.txt $kernel_release