From 1815ad27684435a0612c987b5d6d8893417593f8 Mon Sep 17 00:00:00 2001 From: Prashanth Pai Date: Thu, 10 Mar 2016 11:38:07 +0530 Subject: Fix and simplify tox.ini * Remove deprecated tox options * Simplify tox.ini * Update .gitignore * Update test-requirements.txt * Fix pep8 issues All tests now run on centos7 without any modifications. Code coverage output is now displayed properly for both unit test and functional test runs. Change-Id: I877cc0ad2c560579c12d528af3ac9bf5eea28378 Signed-off-by: Prashanth Pai --- tox.ini | 30 +++++++++--------------------- 1 file changed, 9 insertions(+), 21 deletions(-) (limited to 'tox.ini') diff --git a/tox.ini b/tox.ini index 6965bac..b9213ba 100644 --- a/tox.ini +++ b/tox.ini @@ -1,40 +1,28 @@ [tox] envlist = py26,py27,pep8 +minversion = 1.6 [testenv] -whitelist_externals=bash passenv = LD_LIBRARY_PATH setenv = VIRTUAL_ENV={envdir} - NOSE_WITH_OPENSTACK=1 - NOSE_OPENSTACK_COLOR=1 - NOSE_OPENSTACK_RED=0.05 - NOSE_OPENSTACK_YELLOW=0.025 - NOSE_OPENSTACK_SHOW_ELAPSED=1 - NOSE_OPENSTACK_STDOUT=1 + NOSE_WITH_COVERAGE=1 + NOSE_COVER_BRANCHES=1 + NOSE_COVER_ERASE=1 + NOSE_COVER_PACKAGE=gluster deps = - --download-cache={homedir}/.pipcache -r{toxinidir}/test-requirements.txt -changedir = {toxinidir}/test/unit -commands = nosetests -v --exe --with-xunit --with-coverage --cover-package gluster --cover-erase --cover-xml --cover-html --cover-branches --with-html-output {posargs} - -[tox:jenkins] -downloadcache = ~/cache/pip +commands = nosetests -v {posargs:test/unit} [testenv:functest] -changedir = {toxinidir} -commands = bash functional_tests.sh +commands = ./.functests {posargs} [testenv:pep8] -deps = - --download-cache={homedir}/.pipcache - -r{toxinidir}/test-requirements.txt -changedir = {toxinidir} commands = - flake8 setup.py - flake8 gluster test + flake8 {posargs:gluster test setup.py} [testenv:cover] setenv = NOSE_WITH_COVERAGE=1 + NOSE_COVER_BRANCHES=1 [testenv:venv] commands = {posargs} -- cgit