diff --git a/.gitlab/ci/test.gitlab-ci.yml b/.gitlab/ci/test.gitlab-ci.yml index 8d0d90ded..804940aa2 100644 --- a/.gitlab/ci/test.gitlab-ci.yml +++ b/.gitlab/ci/test.gitlab-ci.yml @@ -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 diff --git a/src/app.py b/src/app.py index 1a6e01e0e..3084e88ed 100644 --- a/src/app.py +++ b/src/app.py @@ -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"] ) diff --git a/src/tests/test_permission.py b/src/tests/test_permission.py index fea928a2e..acb3419c9 100644 --- a/src/tests/test_permission.py +++ b/src/tests/test_permission.py @@ -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", []) ]