From: Kefu Chai <kchai@redhat.com>
Date: Fri, 13 Apr 2018 13:00:42 +0000 (+0800)
Subject: test/dashboard: specify workdir using tox.ini
X-Git-Tag: v13.1.0~269^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F21416%2Fhead;p=ceph.git

test/dashboard: specify workdir using tox.ini

--workdir was introduced in tox v2.4.0, but the tox shipped by
ubuntu/xenial is 2.3.1. also because i removed the step to prepare the
tox using "pip install -r requirements.txt", what we have is the tox
v2.3.1 . so, instead of passing workdir in the command line, we specify
this setting in tox.ini.

also drop the tox in requirements.txt, it's just misleading. and we are
not using the tox installed in the venv.

Fixes: http://tracker.ceph.com/issues/23709
Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/pybind/mgr/dashboard/requirements.txt b/src/pybind/mgr/dashboard/requirements.txt
index fc623ade316..b62aa4bb2d1 100644
--- a/src/pybind/mgr/dashboard/requirements.txt
+++ b/src/pybind/mgr/dashboard/requirements.txt
@@ -28,6 +28,5 @@ Routes==2.4.1
 singledispatch==3.4.0.3
 six==1.11.0
 tempora==1.10
-tox==2.9.1
 virtualenv==15.1.0
 wrapt==1.10.11
diff --git a/src/pybind/mgr/dashboard/run-tox.sh b/src/pybind/mgr/dashboard/run-tox.sh
index 192615cf4cf..81f7de961cf 100755
--- a/src/pybind/mgr/dashboard/run-tox.sh
+++ b/src/pybind/mgr/dashboard/run-tox.sh
@@ -24,4 +24,4 @@ if [ "$WITH_PYTHON3" = "ON" ]; then
   ENV_LIST+="py3-cov,py3-lint"
 fi
 
-tox -c ${TOX_PATH} -e $ENV_LIST --workdir ${CEPH_BUILD_DIR}
+tox -c ${TOX_PATH} -e $ENV_LIST
diff --git a/src/pybind/mgr/dashboard/tox.ini b/src/pybind/mgr/dashboard/tox.ini
index a5cce362c66..372eb13395b 100644
--- a/src/pybind/mgr/dashboard/tox.ini
+++ b/src/pybind/mgr/dashboard/tox.ini
@@ -1,6 +1,7 @@
 [tox]
 envlist = {py27,py3}-cov,{py27,py3}-lint
 skipsdist = true
+toxworkdir = {env:CEPH_BUILD_DIR}
 
 [testenv]
 deps =