ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

[PR #3289/cf433567 backport][stable-2] Fix unit tests (#3292)

Browse source 
* Fix unit tests (#3289)

* Force new enough requests version.

* Revert "Force new enough requests version."

This reverts commit 339d40bef7.

* 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 commit 254bbd8548.

* 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>
(cherry picked from commit cf43356753)

* Add newline.

Co-authored-by: Felix Fontein <felix@fontein.de>
This commit is contained in:
patchback[bot] 2021-08-29 13:19:55 +02:00 committed by GitHub
parent f21b41d3aa
commit 5b4bce3f88
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tests/unit/requirements.txt
View file

@ -21,4 +21,4 @@ lxml
semantic_version semantic_version
# requirement for datadog_downtime module # requirement for datadog_downtime module
datadog-api-client >= 1.0.0b3 ; python_version >= '3.6' datadog-api-client >= 1.0.0b3 ; python_version >= '3.6'

2
tests/utils/shippable/shippable.sh
View file

@ -232,4 +232,4 @@ fi
ansible-test env --dump --show --timeout "${timeout}" --color -v ansible-test env --dump --show --timeout "${timeout}" --color -v
if [ "${SHIPPABLE_BUILD_ID:-}" ]; then "tests/utils/shippable/check_matrix.py"; fi 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}"

5
tests/utils/shippable/units.sh
View file

@ -22,6 +22,11 @@ esac
ansible-test env --timeout "${timeout}" --color -v 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 # shellcheck disable=SC2086
ansible-test units --color -v --docker default --python "${version}" ${COVERAGE:+"$COVERAGE"} ${CHANGED:+"$CHANGED"} \ ansible-test units --color -v --docker default --python "${version}" ${COVERAGE:+"$COVERAGE"} ${CHANGED:+"$CHANGED"} \
"${options[@]:+${options[@]}}" \ "${options[@]:+${options[@]}}" \