Merge pull request #167 from The-Compiler/xdist-tests

Disable xdist tests for now.
This commit is contained in:
Oleg Pidsadnyi 2015-12-20 19:06:44 +01:00
commit 3fbf9e1404
2 changed files with 8 additions and 7 deletions

View File

@ -5,7 +5,7 @@ env:
matrix:
- TESTENV=linters
- TESTENV=py27
- TESTENV=py27-xdist
# - TESTENV=py27-xdist
- TESTENV=py27-pytest-latest
- TESTENV=py34
- TESTENV=coveralls

13
tox.ini
View File

@ -1,6 +1,7 @@
[tox]
distshare={homedir}/.tox/distshare
envlist=linters,py27,py27-xdist,py27-pytest-latest,py34
#envlist=linters,py27,py27-xdist,py27-pytest-latest,py34
envlist=linters,py27,py27-pytest-latest,py34
skip_missing_interpreters = true
[testenv]
@ -11,11 +12,11 @@ deps = -r{toxinidir}/requirements-testing.txt
interpreter=python2.7
commands={[testenv]commands} pytest_bdd --pep8
[testenv:py27-xdist]
basepython=python2.7
commands=
py.test pytest_bdd tests -n3 --pep8 -rfsxX \
--junitxml={envlogdir}/junit-{envname}.xml
#[testenv:py27-xdist]
#basepython=python2.7
#commands=
# py.test pytest_bdd tests -n3 --pep8 -rfsxX \
# --junitxml={envlogdir}/junit-{envname}.xml
[testenv:py27-pytest-latest]
basepython=python2.7