Merge master into features#3884

Merged

nicoddemus merged 89 commits intopytest-dev:featuresfrom

nicoddemus:merge-master-into-features

Aug 26, 2018

Commits on Aug 10, 2018

Collect any tests from a package's __init__.py

turturica
authored and
turturica
committed

Commits on Aug 18, 2018

Fixes capfd so data is available after teardown.

Tyler Richard
authored and
nicoddemus
committed
Added regression test for capfd in a fixture

Tyler Richard
authored and
nicoddemus
committed
Fixtures during teardown can use capsys and capfd to get output from tests
nicoddemus
committed

Commits on Aug 19, 2018

Refactoring: Separated suspend from snapping (stopped always snapping when suspending - solves bug but still missing tests), reorganized functions and context managers.
victor
committed
Improved test to cover more cases.
victor
committed
Fixed test.
victor
committed
Fixed activation and used just runtest_protocol hook
victor
committed
Fixed integration with other modules/tests
victor
committed
Fixed linting.
victor
committed

Commits on Aug 20, 2018

Commits on Aug 21, 2018

Commits on Aug 22, 2018

Commits on Aug 23, 2018

Commits on Aug 24, 2018

Fix linting
nicoddemus
committed
Merge pull request #3859 from asottile/pyupgrade_1_4
asottile
authored
Use `bytes` directly instead of `binary_type`
asottile
committed
Address #3796 and add a test for it.

turturica
authored and
turturica
committed
Make linting happy.

turturica
authored and
turturica
committed
Merge pull request #3868 from asottile/bytes_py26_plus
asottile
authored
Merge pull request #3865 from GandalfSaxe/patch-1
nicoddemus
authored
Merge branch 'master' of github.com:pytest-dev/pytest into fix-3854

turturica
authored and
turturica
committed
Fix dedent after merge.

turturica
authored and
turturica
committed
correct cmdclass
schmamps
committed
Add encoding: utf8 for python 2.7

turturica
authored and
turturica
committed
add to changelog
schmamps
committed
Added changelog items.

turturica
authored and
turturica
committed
Fix test_package_ordering on Windows
nicoddemus
committed
test_package_ordering: Collect *.py, but keep a mix of case for filenames. The test doesn't make sense for Windows, because of its case-insensitivity.

turturica
authored and
turturica
committed

Commits on Aug 25, 2018

Commits on Aug 26, 2018