Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ env:
matrix:
- TESTENV=linters
- TESTENV=py27
- TESTENV=py27-xdist
# - TESTENV=py27-xdist
- TESTENV=py27-pytest-latest
- TESTENV=py34
- TESTENV=coveralls
Expand Down
13 changes: 7 additions & 6 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -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]
Expand All @@ -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]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does it need to be commented out? It is just a section of configuration

#basepython=python2.7
#commands=
# py.test pytest_bdd tests -n3 --pep8 -rfsxX \
# --junitxml={envlogdir}/junit-{envname}.xml

[testenv:py27-pytest-latest]
basepython=python2.7
Expand Down