Skip to content

Fix pexpect tests on MacOS #5336

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
May 30, 2019
Merged

Fix pexpect tests on MacOS #5336

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8e51563
tests: pdb: flush also on MacOS, but read() before
blueyed May 27, 2019
fb12d2a
test_enter_leave_pdb_hooks_are_called: remove child.sendeof()
blueyed May 27, 2019
49c6aeb
ci: Travis: test with pexpect on macos
blueyed May 30, 2019
6896dbc
tox: pexpect: use "-m uses_pexpect"
blueyed May 30, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,6 @@ jobs:
include:
# OSX tests - first (in test stage), since they are the slower ones.
- &test-macos
# NOTE: (tests with) pexpect appear to be buggy on Travis,
# at least with coverage.
# Log: https://travis-ci.org/pytest-dev/pytest/jobs/500358864
os: osx
osx_image: xcode10.1
language: generic
Expand All @@ -33,7 +30,7 @@ jobs:
- python -V
- test $(python -c 'import sys; print("%d%d" % sys.version_info[0:2])') = 27
- <<: *test-macos
env: TOXENV=py37-xdist
env: TOXENV=py37-pexpect,py37-xdist PYTEST_COVERAGE=1
before_install:
- which python3
- python3 -V
Expand Down
7 changes: 3 additions & 4 deletions testing/test_pdb.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
from __future__ import print_function

import os
import platform
import sys

import six
Expand Down Expand Up @@ -153,10 +152,11 @@ def test_func():

@staticmethod
def flush(child):
if platform.system() == "Darwin":
return
if child.isalive():
# Read if the test has not (e.g. test_pdb_unittest_skip).
child.read()
child.wait()
assert not child.isalive()

def test_pdb_unittest_postmortem(self, testdir):
p1 = testdir.makepyfile(
Expand Down Expand Up @@ -797,7 +797,6 @@ def test_post_mortem():
rest = child.read().decode("utf8")
assert "leave_pdb_hook" in rest
assert "1 failed" in rest
child.sendeof()
self.flush(child)

def test_pdb_custom_cls(self, testdir, custom_pdb_calls):
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ setenv =
lsof: _PYTEST_TOX_POSARGS_LSOF=--lsof

pexpect: _PYTEST_TOX_PLATFORM=linux|darwin
pexpect: _PYTEST_TOX_POSARGS_PEXPECT=testing/test_pdb.py testing/test_terminal.py testing/test_unittest.py
pexpect: _PYTEST_TOX_POSARGS_PEXPECT=-m uses_pexpect

twisted: _PYTEST_TOX_POSARGS_TWISTED=testing/test_unittest.py

Expand Down