Skip to content

travis: run tests on macOS #3893

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 6 commits into from
Aug 28, 2018
Merged

travis: run tests on macOS #3893

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ab5af52
Fix macOS specific code that uses capturemanager.
jirikuncar Aug 27, 2018
f786335
travis: run tests on macOS
jirikuncar Aug 27, 2018
29e114b
Try to fix test in MacOS-X
nicoddemus Aug 27, 2018
b2f7e02
Reorganize osx environments to avoid repetition as suggested in review
nicoddemus Aug 27, 2018
a260e58
Drop 3.6 from OS-X to reduce build time
nicoddemus Aug 27, 2018
32575f9
set TOXENV in test-macos template otherwise it will inherit "coveralls"
nicoddemus Aug 27, 2018
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
19 changes: 19 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,25 @@ jobs:
python: '3.7'
sudo: required
dist: xenial
- &test-macos
language: generic
os: osx
osx_image: xcode9.4
sudo: required
env: TOXENV=py27
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should not be defined in the "included" part probably ("&test-macos").

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's good to have a default which get changed later.

install:
- python -m pip install --upgrade --pre tox
- <<: *test-macos
env: TOXENV=py36
install:
- python3 -m pip install --upgrade --pre tox
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Doesn't the normal "install" suffice? (also above)

- <<: *test-macos
env: TOXENV=py37
before_install:
- brew update
- brew upgrade python
- brew unlink python
- brew link python

- stage: deploy
python: '3.6'
Expand Down
1 change: 1 addition & 0 deletions changelog/3888.bugfix.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix macOS specific code using ``capturemanager`` plugin in doctests.
3 changes: 2 additions & 1 deletion src/_pytest/doctest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,8 @@ def _disable_output_capturing_for_darwin(self):
return
capman = self.config.pluginmanager.getplugin("capturemanager")
if capman:
out, err = capman.suspend_global_capture(in_=True)
capman.suspend_global_capture(in_=True)
out, err = capman.read_global_capture()
sys.stdout.write(out)
sys.stderr.write(err)

Expand Down