Skip to content

Commit

Permalink
tests/vmcheck/db: Bump fake glibc.i686 version
Browse files Browse the repository at this point in the history
`authselect-libs` in f36 has a conflict with older glibc (likely as part
of https://fedoraproject.org/wiki/Changes/Make_Authselect_Mandatory) and
throws off this test.
  • Loading branch information
jlebon authored and cgwalters committed May 13, 2022
1 parent dca81a2 commit c43e315
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions tests/vmcheck/test-db.sh
Original file line number Diff line number Diff line change
Expand Up @@ -127,13 +127,13 @@ vm_rpmostree override replace \
vm_build_rpm pkg-to-overlay build 'echo same > pkg-to-overlay'
# some multilib handling tests (override default /bin script to skip conflicts)
vm_build_rpm pkg-to-overlay build 'echo same > pkg-to-overlay' arch i686
vm_build_rpm glibc arch i686
vm_build_rpm glibc arch i686 version 2.35
vm_rpmostree install pkg-to-overlay.{x86_64,i686} glibc.i686
pending_layered_csum=$(vm_get_pending_csum)
check_diff $booted_csum $pending_layered_csum \
+pkg-to-overlay-1.0-1.x86_64 \
+pkg-to-overlay-1.0-1.i686 \
+glibc-1.0-1.i686 \
+glibc-2.35-1.i686 \
+pkg-to-replace-15.4-4 \
+zzz-pkg-to-downgrade-1.0 \
+pkg-to-replace-archtrans-2.0
Expand All @@ -148,7 +148,7 @@ check_not_diff $booted_csum $pending_layered_csum \
check_diff $pending_csum $pending_layered_csum \
+pkg-to-overlay-1.0-1.x86_64 \
+pkg-to-overlay-1.0-1.i686 \
+glibc-1.0-1.i686 \
+glibc-2.35-1.i686 \
-pkg-to-remove \
!zzz-pkg-to-downgrade-2.0 \
=zzz-pkg-to-downgrade-1.0 \
Expand Down Expand Up @@ -180,7 +180,7 @@ fi
check_diff $pending_csum $pending_layered_csum \
+pkg-to-overlay-1.0-1.x86_64 \
+pkg-to-overlay-1.0-1.i686 \
+glibc-1.0-1.i686 \
+glibc-2.35-1.i686 \
-pkg-to-remove \
!pkg-to-replace-15-8 \
=pkg-to-replace-15.4-4 \
Expand All @@ -197,7 +197,7 @@ assert_not_file_has_content out.txt \
assert_file_has_content out.txt \
pkg-to-overlay-1.0-1.x86_64 \
pkg-to-overlay-1.0-1.i686 \
glibc-1.0-1.i686 \
glibc-2.35-1.i686 \
pkg-to-replace-15.4-4 \
pkg-to-replace-archtrans-2.0
echo "ok list from pkglist.metadata"

0 comments on commit c43e315

Please sign in to comment.