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

make pytest test suite pypy ready

This commit is contained in:
holger krekel 2010-11-27 16:40:52 +01:00
parent d894bae281
commit 96a687b97c
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
_pytest/pytester.py
View File

@ -515,6 +515,8 @@ class TmpTestdir:
def spawn(self, cmd, expect_timeout=10.0): def spawn(self, cmd, expect_timeout=10.0):
pexpect = py.test.importorskip("pexpect", "2.4") pexpect = py.test.importorskip("pexpect", "2.4")
if hasattr(sys, 'pypy_version_info') and '64' in py.std.platform.machine():
pytest.skip("pypy-64 bit not supported")
logfile = self.tmpdir.join("spawn.out") logfile = self.tmpdir.join("spawn.out")
child = pexpect.spawn(cmd, logfile=logfile.open("w")) child = pexpect.spawn(cmd, logfile=logfile.open("w"))
child.timeout = expect_timeout child.timeout = expect_timeout

3
tox.ini
View File

@ -59,9 +59,6 @@ commands=
[testenv:py32] [testenv:py32]
deps=py>=1.4.0 deps=py>=1.4.0
[testenv:pypy]
basepython=pypy-c
[testenv:jython] [testenv:jython]
changedir=testing changedir=testing
commands= commands=