mirror of
https://github.com/ansible-collections/community.general.git
synced 2024-09-14 20:13:21 +02:00
Fix unit tests (#3289)
* Force new enough requests version. * Revert "Force new enough requests version." This reverts commit339d40bef7
. * Make sure we don't install a too new python-gitlab for Ansible 2.10. * Change requirement instead of appending new one. * Fix quoting. * Try to skip if import fails. * Revert "Try to skip if import fails." This reverts commit254bbd8548
. * Make other Python versions happy... * Update tests/utils/shippable/units.sh Co-authored-by: Alexei Znamensky <103110+russoz@users.noreply.github.com> Co-authored-by: Alexei Znamensky <103110+russoz@users.noreply.github.com>
This commit is contained in:
parent
a91eb6ae4f
commit
cf43356753
2 changed files with 6 additions and 1 deletions
|
@ -232,4 +232,4 @@ fi
|
|||
ansible-test env --dump --show --timeout "${timeout}" --color -v
|
||||
|
||||
if [ "${SHIPPABLE_BUILD_ID:-}" ]; then "tests/utils/shippable/check_matrix.py"; fi
|
||||
"tests/utils/shippable/${script}.sh" "${test}"
|
||||
"tests/utils/shippable/${script}.sh" "${test}" "${ansible_version}"
|
||||
|
|
|
@ -22,6 +22,11 @@ esac
|
|||
|
||||
ansible-test env --timeout "${timeout}" --color -v
|
||||
|
||||
if [ "$2" == "2.10" ]; then
|
||||
sed -i -E 's/^python-gitlab($| .*)/python-gitlab < 2.10.1 ; python_version >= '\'3.6\''/g' tests/unit/requirements.txt
|
||||
echo "python-gitlab ; python_version < '3.6'" >> tests/unit/requirements.txt
|
||||
fi
|
||||
|
||||
# shellcheck disable=SC2086
|
||||
ansible-test units --color -v --docker default --python "${version}" ${COVERAGE:+"$COVERAGE"} ${CHANGED:+"$CHANGED"} \
|
||||
"${options[@]:+${options[@]}}" \
|
||||
|
|
Loading…
Reference in a new issue