p53209761
/
test_ok2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix python3 issues, add py32 environment 

--HG--
branch : trunk
This commit is contained in:
holger krekel 2010-09-28 17:37:20 +02:00
parent 81ec29a597
commit e2c11f1ddb
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
testing/code/test_source.py
View File

@ -348,7 +348,7 @@ def test_deindent():
lines = deindent(source.splitlines()) lines = deindent(source.splitlines())
assert lines == ['', 'def f():', ' def g():', ' pass', ' '] assert lines == ['', 'def f():', ' def g():', ' pass', ' ']
@py.test.mark.xfail("sys.version_info[:2] != (2,7)") @py.test.mark.xfail("sys.version_info[:2] != (2,7) and sys.version_info[:2]<(3,2)")
def test_source_of_class_at_eof_without_newline(tmpdir): def test_source_of_class_at_eof_without_newline(tmpdir):
# this test fails because the implicit inspect.getsource(A) below # this test fails because the implicit inspect.getsource(A) below
# does not return the "x = 1" last line. # does not return the "x = 1" last line.

1
testing/plugin/test_pytest_terminal.py
View File

@ -112,7 +112,6 @@ class TestTerminal:
child.sendeof() child.sendeof()
child.kill(15) child.kill(15)
@py.test.mark.xfail(reason="re-implement subclassing precision reporting")
def test_itemreport_subclasses_show_subclassed_file(self, testdir): def test_itemreport_subclasses_show_subclassed_file(self, testdir):
p1 = testdir.makepyfile(test_p1=""" p1 = testdir.makepyfile(test_p1="""
class BaseTests: class BaseTests:

4
tox.ini
View File

@ -47,6 +47,10 @@ basepython=python2.4
[testenv:py31] [testenv:py31]
basepython=python3.1 basepython=python3.1
deps= deps=
[testenv:py32]
basepython=python3.2
deps=
#{distshare}/pytest-xdist-*
#[testenv:pypy] #[testenv:pypy]
#python=pypy-c #python=pypy-c
[testenv:jython] [testenv:jython]