Skip to content

Commit f2c01c5

Browse files
committed
Restore pexpect tests and bypass isalive/wait on macOS. Ref pytest-dev#2022.
1 parent 60a347a commit f2c01c5

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

_pytest/pytester.py

-2
Original file line numberDiff line numberDiff line change
@@ -1002,8 +1002,6 @@ def spawn(self, cmd, expect_timeout=10.0):
10021002
pexpect = pytest.importorskip("pexpect", "3.0")
10031003
if hasattr(sys, 'pypy_version_info') and '64' in platform.machine():
10041004
pytest.skip("pypy-64 bit not supported")
1005-
if sys.platform == "darwin":
1006-
pytest.xfail("pexpect does not work reliably on darwin?!")
10071005
if sys.platform.startswith("freebsd"):
10081006
pytest.xfail("pexpect does not work reliably on freebsd")
10091007
logfile = self.tmpdir.join("spawn.out").open("wb")

testing/test_pdb.py

+3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import sys
2+
import platform
23

34
import _pytest._code
45
import pytest
@@ -80,6 +81,8 @@ def test_1():
8081

8182
@staticmethod
8283
def flush(child):
84+
if platform.system() == 'Darwin':
85+
return
8386
if child.isalive():
8487
child.wait()
8588

0 commit comments

Comments
 (0)