floraachy
/
pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2874 from nicoddemus/fix-py27-xdist-envs-2843 

Change directory for py27 xdist-related envs
This commit is contained in:
Ronny Pfannschmidt 2017-10-30 17:09:34 +01:00 committed by GitHub
parent 26019b33f8 27cea340f3
commit cd747c48a4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
testing/test_assertrewrite.py
View File

@ -66,7 +66,7 @@ class TestAssertionRewrite(object):
s = """'Doc string'\nother = stuff""" s = """'Doc string'\nother = stuff"""
m = rewrite(s) m = rewrite(s)
# Module docstrings in 3.7 are part of Module node, it's not in the body # Module docstrings in 3.7 are part of Module node, it's not in the body
# so we remove it so the following body items have the same indexes on # so we remove it so the following body items have the same indexes on
# all Python versions # all Python versions
if sys.version_info < (3, 7): if sys.version_info < (3, 7):
assert isinstance(m.body[0], ast.Expr) assert isinstance(m.body[0], ast.Expr)

6
tox.ini
View File

@ -64,8 +64,9 @@ deps =
mock mock
nose nose
hypothesis>=3.5.2 hypothesis>=3.5.2
changedir=testing
commands = commands =
pytest -n1 -rfsxX {posargs:testing} pytest -n1 -rfsxX {posargs:.}
[testenv:py36-xdist] [testenv:py36-xdist]
deps = {[testenv:py27-xdist]deps} deps = {[testenv:py27-xdist]deps}
@ -91,10 +92,11 @@ deps =
pytest-xdist>=1.13 pytest-xdist>=1.13
hypothesis>=3.5.2 hypothesis>=3.5.2
distribute = true distribute = true
changedir=testing
setenv = setenv =
PYTHONDONTWRITEBYTECODE=1 PYTHONDONTWRITEBYTECODE=1
commands = commands =
pytest -n3 -rfsxX {posargs:testing} pytest -n3 -rfsxX {posargs:.}
[testenv:py27-trial] [testenv:py27-trial]
deps = twisted deps = twisted