Skip to content

Commit

Permalink
Merge pull request #2874 from nicoddemus/fix-py27-xdist-envs-2843
Browse files Browse the repository at this point in the history
Change directory for py27 xdist-related envs
  • Loading branch information
RonnyPfannschmidt authored Oct 30, 2017
2 parents 26019b3 + 27cea34 commit cd747c4
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion testing/test_assertrewrite.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ def test_place_initial_imports(self):
s = """'Doc string'\nother = stuff"""
m = rewrite(s)
# 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
if sys.version_info < (3, 7):
assert isinstance(m.body[0], ast.Expr)
Expand Down
6 changes: 4 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,9 @@ deps =
mock
nose
hypothesis>=3.5.2
changedir=testing
commands =
pytest -n1 -rfsxX {posargs:testing}
pytest -n1 -rfsxX {posargs:.}

[testenv:py36-xdist]
deps = {[testenv:py27-xdist]deps}
Expand All @@ -91,10 +92,11 @@ deps =
pytest-xdist>=1.13
hypothesis>=3.5.2
distribute = true
changedir=testing
setenv =
PYTHONDONTWRITEBYTECODE=1
commands =
pytest -n3 -rfsxX {posargs:testing}
pytest -n3 -rfsxX {posargs:.}

[testenv:py27-trial]
deps = twisted
Expand Down

0 comments on commit cd747c4

Please sign in to comment.