tests: fix packaging 22.x breaking tests because dropped support for LegacyVersion ... + fix a couple edge cases

This commit is contained in:
Alexandre Aubin 2022-12-09 02:45:03 +01:00
parent c38aba740c
commit 19b0835030
3 changed files with 3 additions and 4 deletions

View file

@ -1,7 +1,7 @@
.install_debs: &install_debs .install_debs: &install_debs
- apt-get update -o Acquire::Retries=3 - apt-get update -o Acquire::Retries=3
- DEBIAN_FRONTEND=noninteractive SUDO_FORCE_REMOVE=yes apt --assume-yes -o Dpkg::Options::="--force-confold" --allow-downgrades install ./$YNH_BUILD_DIR/*.deb - DEBIAN_FRONTEND=noninteractive SUDO_FORCE_REMOVE=yes apt --assume-yes -o Dpkg::Options::="--force-confold" --allow-downgrades install ./$YNH_BUILD_DIR/*.deb
- pip3 install -U mock pip pytest pytest-cov pytest-mock pytest-sugar requests-mock tox ansi2html black jinja2 - pip3 install -U mock pip pytest pytest-cov pytest-mock pytest-sugar requests-mock tox ansi2html black jinja2 "packaging<22"
.test-stage: .test-stage:
stage: test stage: test

View file

@ -2365,8 +2365,7 @@ def _check_manifest_requirements(manifest: Dict, action: str):
logger.debug(m18n.n("app_requirements_checking", app=app_id)) logger.debug(m18n.n("app_requirements_checking", app=app_id))
# Yunohost version requirement # Yunohost version requirement
yunohost_requirement = version.parse(manifest["integration"]["yunohost"].strip(">= ") or "4.3")
yunohost_requirement = version.parse(manifest["integration"]["yunohost"] or "4.3")
yunohost_installed_version = version.parse( yunohost_installed_version = version.parse(
get_ynh_package_version("yunohost")["version"] get_ynh_package_version("yunohost")["version"]
) )

View file

@ -258,7 +258,7 @@ def check_LDAP_db_integrity():
for user in user_search: for user in user_search:
user_dn = "uid=" + user["uid"][0] + ",ou=users,dc=yunohost,dc=org" user_dn = "uid=" + user["uid"][0] + ",ou=users,dc=yunohost,dc=org"
group_list = [_ldap_path_extract(m, "cn") for m in user["memberOf"]] group_list = [_ldap_path_extract(m, "cn") for m in user.get("memberOf", [])]
permission_list = [ permission_list = [
_ldap_path_extract(m, "cn") for m in user.get("permission", []) _ldap_path_extract(m, "cn") for m in user.get("permission", [])
] ]