From 5b4bce3f88442e847b7cf1dbad803992a7d1fd31 Mon Sep 17 00:00:00 2001
From: "patchback[bot]" <45432694+patchback[bot]@users.noreply.github.com>
Date: Sun, 29 Aug 2021 13:19:55 +0200
Subject: [PATCH] [PR #3289/cf433567 backport][stable-2] Fix unit tests (#3292)

* Fix unit tests (#3289)

* Force new enough requests version.

* Revert "Force new enough requests version."

This reverts commit 339d40bef7d10e19b4d8beb885eb7e414b5c7354.

* 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 254bbd8548c08be4d49aca2e2fcedf23e1d23436.

* 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 cf433567535d2a854335a4e252aa6320752208b3)

* Add newline.

Co-authored-by: Felix Fontein <felix@fontein.de>
---
 tests/unit/requirements.txt        | 2 +-
 tests/utils/shippable/shippable.sh | 2 +-
 tests/utils/shippable/units.sh     | 5 +++++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/tests/unit/requirements.txt b/tests/unit/requirements.txt
index 1d082cffb8..927a5d99b6 100644
--- a/tests/unit/requirements.txt
+++ b/tests/unit/requirements.txt
@@ -21,4 +21,4 @@ lxml
 semantic_version
 
 # requirement for datadog_downtime module
-datadog-api-client >= 1.0.0b3 ; python_version >= '3.6'
\ No newline at end of file
+datadog-api-client >= 1.0.0b3 ; python_version >= '3.6'
diff --git a/tests/utils/shippable/shippable.sh b/tests/utils/shippable/shippable.sh
index 3a00812f12..5f94d9fff5 100755
--- a/tests/utils/shippable/shippable.sh
+++ b/tests/utils/shippable/shippable.sh
@@ -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}"
diff --git a/tests/utils/shippable/units.sh b/tests/utils/shippable/units.sh
index 38e79935e7..88db336d26 100755
--- a/tests/utils/shippable/units.sh
+++ b/tests/utils/shippable/units.sh
@@ -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[@]}}" \