From cb518856c4111f25e4a7a8550d01660451fb6a11 Mon Sep 17 00:00:00 2001
From: Jiri Kucera <jkucera@redhat.com>
Date: Wed, 22 Jan 2020 09:59:55 +0100
Subject: [PATCH] Run molecule via runsyspycmd.sh

runsyspycmd.sh script runs a given command only if venv Python
matches the system Python (this prevents failing when some command
depends on binary libraries).

Also put `molecule --version` and `ansible --version` to a standalone
testenv ([testenv:molecule_version]) so a user can display molecule
and ansible version by typing `tox -e molecule_version` without
running `molecule lint`.
---
 .travis/runsyspycmd.sh | 37 +++++++++++++++++++++++++++++++++++++
 .travis/utils.sh       |  8 ++++++--
 tox.ini                | 36 ++++++++++++++++++++++++++++--------
 3 files changed, 71 insertions(+), 10 deletions(-)
 create mode 100755 .travis/runsyspycmd.sh

diff --git a/.travis/runsyspycmd.sh b/.travis/runsyspycmd.sh
new file mode 100755
index 0000000..13e0344
--- /dev/null
+++ b/.travis/runsyspycmd.sh
@@ -0,0 +1,37 @@
+#!/bin/bash
+# SPDX-License-Identifier: MIT
+
+# Execute command in environment python only if environment python has access
+# to system python libraries, especially C bindings. The script is run with
+# these arguments:
+#
+#   $1     - path to environment python
+#   $2     - path to system python
+#   $3     - command runnable in Python (should be present in $PATH)
+#   ${@:4} - arguments passed to $3
+
+set -e
+
+ME=$(basename $0)
+SCRIPTDIR=$(readlink -f $(dirname $0))
+TOPDIR=$(readlink -f ${SCRIPTDIR}/..)
+
+. ${SCRIPTDIR}/utils.sh
+. ${SCRIPTDIR}/config.sh
+
+# Sanitize arguments (see https://github.com/tox-dev/tox/issues/1463):
+ENVPYTHON=$(readlink -f $1)
+SYSPYTHON=$(readlink -f $2)
+shift 2
+
+if ! lsr_venv_python_matches_system_python ${ENVPYTHON} ${SYSPYTHON}; then
+  lsr_info "${ME}: ${1:-<missing command>}:" \
+    "Environment Python has no access to system Python libraries. Skipping."
+  exit 0
+fi
+
+COMMAND=$(command -v $1)
+shift
+
+set -x
+${ENVPYTHON} ${COMMAND} "$@"
diff --git a/.travis/utils.sh b/.travis/utils.sh
index fd17988..397dedf 100644
--- a/.travis/utils.sh
+++ b/.travis/utils.sh
@@ -136,10 +136,14 @@ function lsr_compare_pythons() {
 }
 
 ##
-# lsr_venv_python_matches_system_python
+# lsr_venv_python_matches_system_python [$1] [$2]
+#
+#   $1 - command or full path to venv Python interpreter (default: python)
+#   $2 - command or full path to the system Python interpreter
+#        (default: /usr/bin/python3)
 #
 # Exit with 0 if virtual environment Python version matches the system Python
 # version.
 function lsr_venv_python_matches_system_python() {
-  lsr_compare_pythons python -eq /usr/bin/python3
+  lsr_compare_pythons ${1:-python} -eq ${2:-/usr/bin/python3}
 }
diff --git a/tox.ini b/tox.ini
index dd1b355..b50ce40 100644
--- a/tox.ini
+++ b/tox.ini
@@ -178,38 +178,58 @@ deps =
     molecule
     selinux
     -rmolecule_extra_requirements.txt
+runsyspycmd = {toxinidir}/.travis/runsyspycmd.sh
+
+[testenv:molecule_version]
+envdir = {toxworkdir}/env-{env:TRAVIS_PYTHON_VERSION:molecule}
+deps =
+    {[molecule_common]deps}
+whitelist_externals =
+    {[base]whitelist_externals}
+commands =
+    bash {[molecule_common]runsyspycmd} {envpython} {[base]system_python} \
+         molecule --version
+    bash {[molecule_common]runsyspycmd} {envpython} {[base]system_python} \
+         ansible --version
 
 [testenv:molecule_lint]
 envdir = {toxworkdir}/env-{env:TRAVIS_PYTHON_VERSION:molecule}
 deps =
     {[molecule_common]deps}
-commands_pre =
-    molecule --version
-    ansible --version
+whitelist_externals =
+    {[base]whitelist_externals}
 commands =
-    molecule lint -s {env:LSR_MSCENARIO:default} {posargs}
+    bash {[molecule_common]runsyspycmd} {envpython} {[base]system_python} \
+         molecule lint -s {env:LSR_MSCENARIO:default} {posargs}
 
 [testenv:molecule_syntax]
 envdir = {toxworkdir}/env-{env:TRAVIS_PYTHON_VERSION:molecule}
 deps =
     {[molecule_common]deps}
+whitelist_externals =
+    {[base]whitelist_externals}
 commands =
-    molecule syntax -s {env:LSR_MSCENARIO:default} {posargs}
+    bash {[molecule_common]runsyspycmd} {envpython} {[base]system_python} \
+         molecule syntax -s {env:LSR_MSCENARIO:default} {posargs}
 
 [testenv:molecule_test]
 envdir = {toxworkdir}/env-{env:TRAVIS_PYTHON_VERSION:molecule}
 deps =
     {[molecule_common]deps}
+whitelist_externals =
+    {[base]whitelist_externals}
 commands =
-    molecule test -s {env:LSR_MSCENARIO:default} {posargs}
+    bash {[molecule_common]runsyspycmd} {envpython} {[base]system_python} \
+         molecule test -s {env:LSR_MSCENARIO:default} {posargs}
 
 [testenv:molecule]
 envdir = {toxworkdir}/env-{env:TRAVIS_PYTHON_VERSION:molecule}
 deps =
     {[molecule_common]deps}
-commands_pre =
-    {[testenv:molecule_lint]commands_pre}
+whitelist_externals =
+    {[base]whitelist_externals}
 commands =
+    {[testenv:molecule_version]commands}
     {[testenv:molecule_lint]commands}
     {[testenv:molecule_syntax]commands}
     {[testenv:molecule_test]commands}