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

xfail a test on pypy that checks wrong encoding/ascii (pypy does 

not error out). fixes issue385.

also re-enable pypy tests in tox.
This commit is contained in:
holger krekel 2013-11-19 11:18:51 +01:00
parent eda8b02a8d
commit 7f49e0fddc
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG
View File

@ -39,6 +39,8 @@ Unreleased
arg is an lambda and thus the example will work. Thanks Alex Gaynor arg is an lambda and thus the example will work. Thanks Alex Gaynor
for bringing it up. for bringing it up.
- xfail a test on pypy that checks wrong encoding/ascii (pypy does
not error out). fixes issue385.
Changes between 2.4.1 and 2.4.2 Changes between 2.4.1 and 2.4.2
----------------------------------- -----------------------------------

3
testing/test_assertrewrite.py
View File

@ -441,8 +441,9 @@ class TestAssertionRewriteHookDetails(object):
]) ])
@pytest.mark.skipif("sys.version_info[0] >= 3") @pytest.mark.skipif("sys.version_info[0] >= 3")
@pytest.mark.xfail("hasattr(sys, 'pypy_translation_info')")
def test_assume_ascii(self, testdir): def test_assume_ascii(self, testdir):
content = "u'\xe2\x99\xa5'" content = "u'\xe2\x99\xa5\x01\xfe'"
testdir.tmpdir.join("test_encoding.py").write(content, "wb") testdir.tmpdir.join("test_encoding.py").write(content, "wb")
res = testdir.runpytest() res = testdir.runpytest()
assert res.ret != 0 assert res.ret != 0

2
tox.ini
View File

@ -1,6 +1,6 @@
[tox] [tox]
distshare={homedir}/.tox/distshare distshare={homedir}/.tox/distshare
envlist=flakes,py25,py26,py27,py27-nobyte,py32,py33,py27-xdist,trial envlist=flakes,py25,py26,py27,pypy,py27-nobyte,py32,py33,py27-xdist,trial
[testenv] [testenv]
changedir=testing changedir=testing