diff --git a/distro/tests/manager-packaging/control b/distro/tests/manager-packaging/control index f70a0b33a182816566dd94fb9b963e06230d761b..6f9c01fd26001d4f2190e0ef2bfae06a95157614 100644 --- a/distro/tests/manager-packaging/control +++ b/distro/tests/manager-packaging/control @@ -13,9 +13,9 @@ Tests: systemd_service.sh Tests-Directory: manager/tests/packaging Restrictions: needs-root {% if distro.match('fedora') -%} -Depends: knot-utils, jq, curl +Depends: knot-utils, jq, curl, procps {% elif distro.match('debian') or distro.match('ubuntu') -%} -Depends: knot-dnsutils, jq, curl +Depends: knot-dnsutils, jq, curl, procps {% elif distro.match('arch') -%} Depends: knot, jq, curl {% elif distro.match('opensuse') -%} diff --git a/manager/pyproject.toml b/manager/pyproject.toml index 08fc90ca086a1d6bdba850cb6f37aa63e4d93094..821042ae63a5b5744fd03d1d6933767f1d61359b 100644 --- a/manager/pyproject.toml +++ b/manager/pyproject.toml @@ -15,12 +15,12 @@ generate-setup-file = true [tool.poetry.dependencies] python = "^3.6.8" -aiohttp = "^3.6.12" +aiohttp = "^3.6" Jinja2 = "^2.11.3" PyYAML = "*" typing-extensions = ">=3.7.2" prometheus-client = "^0.6" -supervisor = "^4.2.2" +supervisor = "^4" [tool.poetry.dev-dependencies] pytest-cov = "^2.11.1" diff --git a/manager/setup.py b/manager/setup.py index bde19d66a49d7f52f8b30878db113e259144505a..7d9ea59df0f57d0cd20f8e7c7b768563b08ce0c8 100644 --- a/manager/setup.py +++ b/manager/setup.py @@ -21,9 +21,9 @@ package_data = \ install_requires = \ ['Jinja2>=2.11.3', 'PyYAML', - 'aiohttp>=3.6.12', + 'aiohttp>=3.6', 'prometheus-client>=0.6', - 'supervisor>=4.2.2', + 'supervisor>=4', 'typing-extensions>=3.7.2'] entry_points = \ diff --git a/manager/tests/packaging/interactive/workers.sh b/manager/tests/packaging/interactive/workers.sh index ff605dca12951a3ee4b6923198b14a7bdf813d1d..a0e7fd2cb55072cb5e152f70026a35580de9abc5 100755 --- a/manager/tests/packaging/interactive/workers.sh +++ b/manager/tests/packaging/interactive/workers.sh @@ -1,7 +1,7 @@ #!/bin/bash -# set -e +set -e -# kresctl config /workers 5 +kresctl config /workers 5 -# test "$(ps -a -x | grep kresd | grep -v grep | wc -l)" -eq 5 +test "$(ps -a -x | grep kresd | grep -v grep | wc -l)" -eq 5