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

Restore pexpect tests and bypass isalive/wait on macOS. Ref #2022.

This commit is contained in:
Jason R. Coombs 2016-10-21 12:36:42 -04:00
parent 60a347aeb5
commit f2c01c5407
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
_pytest/pytester.py
View File

@ -1002,8 +1002,6 @@ class Testdir:
pexpect = pytest.importorskip("pexpect", "3.0") pexpect = pytest.importorskip("pexpect", "3.0")
if hasattr(sys, 'pypy_version_info') and '64' in platform.machine(): if hasattr(sys, 'pypy_version_info') and '64' in platform.machine():
pytest.skip("pypy-64 bit not supported") pytest.skip("pypy-64 bit not supported")
if sys.platform == "darwin":
pytest.xfail("pexpect does not work reliably on darwin?!")
if sys.platform.startswith("freebsd"): if sys.platform.startswith("freebsd"):
pytest.xfail("pexpect does not work reliably on freebsd") pytest.xfail("pexpect does not work reliably on freebsd")
logfile = self.tmpdir.join("spawn.out").open("wb") logfile = self.tmpdir.join("spawn.out").open("wb")

3
testing/test_pdb.py
View File

@ -1,4 +1,5 @@
import sys import sys
import platform
import _pytest._code import _pytest._code
import pytest import pytest
@ -80,6 +81,8 @@ class TestPDB:
@staticmethod @staticmethod
def flush(child): def flush(child):
if platform.system() == 'Darwin':
return
if child.isalive(): if child.isalive():
child.wait() child.wait()