From: Brad Hubbard <bhubbard@redhat.com>
Date: Mon, 29 Jan 2018 00:13:04 +0000 (+1000)
Subject: tests: ceph-disk: Remove sitepackages=True
X-Git-Tag: v13.0.2~382^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7cbf1a6bf5fecc83c41a8f91436fae69f15c2a24;p=ceph.git

tests: ceph-disk: Remove sitepackages=True

"sitepackages=True" causes issues on systems that may have packages like
"coverage" or "pytest" installed at the system level. We can try just
white listing "prettyprint" which was the driver for the "sitepackages"
blanket change in the first place.

Fixes: http://tracker.ceph.com/issues/22823

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

diff --git a/src/ceph-disk/tox.ini b/src/ceph-disk/tox.ini
index c65f52a83d665..6c2e17e92b7f0 100644
--- a/src/ceph-disk/tox.ini
+++ b/src/ceph-disk/tox.ini
@@ -17,7 +17,7 @@ deps =
   ../ceph-detect-init
 
 [testenv:py27]
-sitepackages=True
+whitelist_externals = prettyprint
 passenv = CEPH_ROOT CEPH_BIN CEPH_LIB CEPH_BUILD_VIRTUALENV
 changedir = {env:CEPH_BUILD_DIR}
 commands = coverage run --append --source=ceph_disk {envbindir}/py.test -vv {toxinidir}/tests/test_main.py