From 970d44a25c29faa747a57675ab9ab690141adb55 Mon Sep 17 00:00:00 2001
From: Felix Fontein <felix@fontein.de>
Date: Fri, 1 May 2020 12:21:15 +0200
Subject: [PATCH] Avoid sanity excludes so that users can run  ansible-test
 sanity --docker  and it usually passes. (#41)

---
 tests/sanity/ignore-2.10.txt       | 4 +++-
 tests/sanity/ignore-2.9.txt        | 2 ++
 tests/utils/shippable/sanity.sh    | 6 ------
 tests/utils/shippable/shippable.sh | 5 +++--
 tests/utils/shippable/units.sh     | 1 -
 5 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/tests/sanity/ignore-2.10.txt b/tests/sanity/ignore-2.10.txt
index 4df34ad6..0eb60c28 100644
--- a/tests/sanity/ignore-2.10.txt
+++ b/tests/sanity/ignore-2.10.txt
@@ -13,4 +13,6 @@ tests/unit/plugins/module_utils/conftest.py metaclass-boilerplate
 tests/unit/plugins/modules/conftest.py future-import-boilerplate
 tests/unit/plugins/modules/conftest.py metaclass-boilerplate
 tests/unit/plugins/modules/utils.py future-import-boilerplate
-tests/unit/plugins/modules/utils.py metaclass-boilerplate
\ No newline at end of file
+tests/unit/plugins/modules/utils.py metaclass-boilerplate
+tests/utils/shippable/check_matrix.py replace-urlopen
+tests/utils/shippable/timing.py shebang
diff --git a/tests/sanity/ignore-2.9.txt b/tests/sanity/ignore-2.9.txt
index 2e974712..7982d71d 100644
--- a/tests/sanity/ignore-2.9.txt
+++ b/tests/sanity/ignore-2.9.txt
@@ -12,3 +12,5 @@ tests/unit/plugins/modules/conftest.py future-import-boilerplate
 tests/unit/plugins/modules/conftest.py metaclass-boilerplate
 tests/unit/plugins/modules/utils.py future-import-boilerplate
 tests/unit/plugins/modules/utils.py metaclass-boilerplate
+tests/utils/shippable/check_matrix.py replace-urlopen
+tests/utils/shippable/timing.py shebang
diff --git a/tests/utils/shippable/sanity.sh b/tests/utils/shippable/sanity.sh
index 9b7ab740..dd1e68b9 100755
--- a/tests/utils/shippable/sanity.sh
+++ b/tests/utils/shippable/sanity.sh
@@ -2,11 +2,6 @@
 
 set -o pipefail -eux
 
-declare -a args
-IFS='/:' read -ra args <<< "$1"
-
-group="${args[1]}"
-
 if [ "${BASE_BRANCH:-}" ]; then
     base_branch="origin/${BASE_BRANCH}"
 else
@@ -16,5 +11,4 @@ fi
 # shellcheck disable=SC2086
 ansible-test sanity --color -v --junit ${COVERAGE:+"$COVERAGE"} ${CHANGED:+"$CHANGED"} \
     --docker --base-branch "${base_branch}" \
-    --exclude shippable.yml --exclude tests/utils/ \
     --allow-disabled
diff --git a/tests/utils/shippable/shippable.sh b/tests/utils/shippable/shippable.sh
index c9dfe072..7bc3676b 100755
--- a/tests/utils/shippable/shippable.sh
+++ b/tests/utils/shippable/shippable.sh
@@ -35,6 +35,7 @@ python -V
 
 function retry
 {
+    # shellcheck disable=SC2034
     for repetition in 1 2 3; do
         set +e
         "$@"
@@ -43,9 +44,9 @@ function retry
         if [ ${result} == 0 ]; then
             return ${result}
         fi
-        echo "$@ -> ${result}"
+        echo "@* -> ${result}"
     done
-    echo "Command '$@' failed 3 times!"
+    echo "Command '@*' failed 3 times!"
     exit -1
 }
 
diff --git a/tests/utils/shippable/units.sh b/tests/utils/shippable/units.sh
index 937a93df..bbb506a1 100755
--- a/tests/utils/shippable/units.sh
+++ b/tests/utils/shippable/units.sh
@@ -6,7 +6,6 @@ declare -a args
 IFS='/:' read -ra args <<< "$1"
 
 version="${args[1]}"
-group="${args[2]}"
 
 if [[ "${COVERAGE:-}" == "--coverage" ]]; then
     timeout=90