mgr/run-tox-tests: Fix issue with PYTHONPATH

Something changed recently on Bionic which caused tox to fail when
PYTHONPATH is a relative path.  For some reason the path is mangled by
the time it gets to pytest so we need to ensure we are using an absolute
path. This seems to be nautilus specific, at least ATM.

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>

diff --git a/src/pybind/mgr/ansible/tox.ini b/src/pybind/mgr/ansible/tox.ini
index 1df28401be79e69c1825233e2527f9da93ee03e5..ae9888a6d99a89d4c308ca82af7814794297808f 100644 (file)
--- a/src/pybind/mgr/ansible/tox.ini
+++ b/src/pybind/mgr/ansible/tox.ini
@@ -11,8 +11,8 @@ deps =
     requests-mock
 setenv=
     UNITTEST = true
-    py27: PYTHONPATH = {toxinidir}/../../../../build/lib/cython_modules/lib.2
-    py3:  PYTHONPATH = {toxinidir}/../../../../build/lib/cython_modules/lib.3
+    py27: PYTHONPATH = {env:CEPH_LIB}/cython_modules/lib.2
+    py3:  PYTHONPATH = {env:CEPH_LIB}/cython_modules/lib.3
 
 commands=
     {envbindir}/py.test tests/

diff --git a/src/pybind/mgr/dashboard/tox.ini b/src/pybind/mgr/dashboard/tox.ini
index 2e0947868015ae451e8137c86f5e5c49eac53d20..0c62ceab61cebd86565acb83edbdcfa9518fae99 100644 (file)
--- a/src/pybind/mgr/dashboard/tox.ini
+++ b/src/pybind/mgr/dashboard/tox.ini
@@ -11,8 +11,8 @@ setenv=
     WEBTEST_INTERACTIVE = false
     LD_LIBRARY_PATH = {toxinidir}/../../../../build/lib
     PATH = {toxinidir}/../../../../build/bin:$PATH
-    py27: PYTHONPATH = {toxinidir}/../../../../build/lib/cython_modules/lib.2
-    py3:  PYTHONPATH = {toxinidir}/../../../../build/lib/cython_modules/lib.3
+    py27: PYTHONPATH = {env:CEPH_LIB}/cython_modules/lib.2
+    py3:  PYTHONPATH = {env:CEPH_LIB}/cython_modules/lib.3
     cov:  UNITTEST = true
     cov:  COVERAGE_FILE = .coverage.{envname}
 commands=

diff --git a/src/pybind/mgr/insights/tox.ini b/src/pybind/mgr/insights/tox.ini
index 207e6fb923498e64313ce849df381c350b4704bf..ddb98cea2c34e7d9a914a195514be67f701ee049 100644 (file)
--- a/src/pybind/mgr/insights/tox.ini
+++ b/src/pybind/mgr/insights/tox.ini
@@ -10,7 +10,7 @@ deps =
     mock
 setenv=
     UNITTEST = true
-    py27: PYTHONPATH = {toxinidir}/../../../../build/lib/cython_modules/lib.2
-    py3:  PYTHONPATH = {toxinidir}/../../../../build/lib/cython_modules/lib.3
+    py27: PYTHONPATH = {env:CEPH_LIB}/cython_modules/lib.2
+    py3:  PYTHONPATH = {env:CEPH_LIB}/cython_modules/lib.3
 commands=
     {envbindir}/py.test tests/

diff --git a/src/pybind/mgr/orchestrator_cli/tox.ini b/src/pybind/mgr/orchestrator_cli/tox.ini
index fb3c90e712a08c3b8da278709e5e0d44c8d73ecf..94dd70ddb62a3d4989ec4a2725e3acc35718f0ef 100644 (file)
--- a/src/pybind/mgr/orchestrator_cli/tox.ini
+++ b/src/pybind/mgr/orchestrator_cli/tox.ini
@@ -11,8 +11,8 @@ deps =
     requests-mock
 setenv=
     UNITTEST = true
-    py27: PYTHONPATH = {toxinidir}/../../../../build/lib/cython_modules/lib.2
-    py3:  PYTHONPATH = {toxinidir}/../../../../build/lib/cython_modules/lib.3
+    py27: PYTHONPATH = {env:CEPH_LIB}/cython_modules/lib.2
+    py3:  PYTHONPATH = {env:CEPH_LIB}/cython_modules/lib.3
 
 commands=
     {envbindir}/py.test .