Skip to content

Commit

Permalink
fix tests to accomodate newer pep version which is more sensitive
Browse files Browse the repository at this point in the history
to detecting "E265 too many spaces"

add py34 to tox.ini
  • Loading branch information
hpk42 committed Apr 27, 2014
1 parent 4e00bda commit e2be823
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 4 deletions.
8 changes: 8 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
xxx
----------

- fix tests to accomodate newer pep version which is more sensitive
to detecting "E265 too many spaces"

- add py34 to tox.ini

1.0.6
--------------

Expand Down
6 changes: 3 additions & 3 deletions test_pep8.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class TestIgnores:
def pytest_funcarg__example(self, request):
testdir = request.getfuncargvalue("testdir")
p = testdir.makepyfile("")
p.write("class AClass:\n pass\n \n\n#too many spaces")
p.write("class AClass:\n pass\n \n\n# too many spaces")
return p

def test_ignores(self, tmpdir):
Expand Down Expand Up @@ -45,7 +45,7 @@ def test_ignores_all(self, testdir):
def test_w293w292(self, testdir, example):
result = testdir.runpytest("--pep8", )
result.stdout.fnmatch_lines([
#"*plugins*pep8*",
# "*plugins*pep8*",
"*W293*",
"*W292*",
])
Expand All @@ -55,7 +55,7 @@ def test_mtime_caching(self, testdir, example):
testdir.tmpdir.ensure("hello.py")
result = testdir.runpytest("--pep8", )
result.stdout.fnmatch_lines([
#"*plugins*pep8*",
# "*plugins*pep8*",
"*W293*",
"*W292*",
"*1 failed*1 passed*",
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist=py25,py27,py27-pytesttrunk,py33,py-xdist
envlist=py26,py27,py27-pytesttrunk,py33,py-xdist,py34

[testenv]
deps=pytest
Expand Down

0 comments on commit e2be823

Please sign in to comment.