Skip to content
Snippets Groups Projects

parse: apkindex: fix provider_priority never actually being an int

Merged Caleb Connolly requested to merge caleb/apkindex-fix-and-test into master
from pmb.core.arch import Arch
from .apkindex import parse as parse_apkindex
@@ -231,6 +229,7 @@ k:10
D:blkid btrfs-progs buffyboard busybox-extras bzip2 cryptsetup device-mapper devicepkg-utils>=0.2.0 dosfstools e2fsprogs e2fsprogs-extra f2fs-tools font-terminus iskey kmod libinput-libs lz4 multipath-tools parted postmarketos-fde-unlocker postmarketos-mkinitfs>=2.2 udev unudhcpd util-linux-misc xz
p:postmarketos-ramdisk=3.3.5-r2"""
def test_apkindex_parse(tmp_path) -> None:
tmpfile = tmp_path / "APKINDEX.1"
print(tmp_path)
@@ -249,7 +248,10 @@ def test_apkindex_parse(tmp_path) -> None:
# and that it's one provider (postmarketos-initramfs) is declared
assert "postmarketos-ramdisk" in blocks.keys()
assert "postmarketos-initramfs" in blocks["postmarketos-ramdisk"].keys()
assert blocks["postmarketos-ramdisk"]["postmarketos-initramfs"] == blocks["postmarketos-initramfs"]["postmarketos-initramfs"]
assert (
blocks["postmarketos-ramdisk"]["postmarketos-initramfs"]
== blocks["postmarketos-initramfs"]["postmarketos-initramfs"]
)
initramfs = blocks["postmarketos-initramfs"]["postmarketos-initramfs"]
assert initramfs.pkgname == "postmarketos-initramfs"
@@ -288,11 +290,13 @@ def test_apkindex_parse(tmp_path) -> None:
assert tinydm.provides == ["postmarketos-base-tinydm"]
assert tinydm.version == "29-r1"
assert tinydm.arch == Arch.aarch64
wayland = blocks["postmarketos-base-ui-wayland"]["postmarketos-base-ui-wayland"]
# Doesn't provide an explicit version
assert wayland.provides == []
assert wayland.origin == "postmarketos-base-ui"
networkmanager = blocks["postmarketos-base-ui-networkmanager"]["postmarketos-base-ui-networkmanager"]
networkmanager = blocks["postmarketos-base-ui-networkmanager"][
"postmarketos-base-ui-networkmanager"
]
assert networkmanager.provider_priority is None
Loading