mirror of
https://github.com/YunoHost/yunohost.git
synced 2024-09-03 20:06:10 +02:00
tests: fix packaging 22.x breaking tests because dropped support for LegacyVersion ... + fix a couple edge cases
This commit is contained in:
parent
c38aba740c
commit
19b0835030
3 changed files with 3 additions and 4 deletions
|
@ -1,7 +1,7 @@
|
|||
.install_debs: &install_debs
|
||||
- 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
|
||||
- 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:
|
||||
stage: test
|
||||
|
|
|
@ -2365,8 +2365,7 @@ def _check_manifest_requirements(manifest: Dict, action: str):
|
|||
logger.debug(m18n.n("app_requirements_checking", app=app_id))
|
||||
|
||||
# Yunohost version requirement
|
||||
|
||||
yunohost_requirement = version.parse(manifest["integration"]["yunohost"] or "4.3")
|
||||
yunohost_requirement = version.parse(manifest["integration"]["yunohost"].strip(">= ") or "4.3")
|
||||
yunohost_installed_version = version.parse(
|
||||
get_ynh_package_version("yunohost")["version"]
|
||||
)
|
||||
|
|
|
@ -258,7 +258,7 @@ def check_LDAP_db_integrity():
|
|||
|
||||
for user in user_search:
|
||||
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 = [
|
||||
_ldap_path_extract(m, "cn") for m in user.get("permission", [])
|
||||
]
|
||||
|
|
Loading…
Add table
Reference in a new issue