Fix #3854#3861

Merged

nicoddemus merged 13 commits intopytest-dev:masterfrom

jonozzz:fix-3854

Aug 25, 2018

Commits on Aug 10, 2018

Collect any tests from a package's __init__.py

turturica
authored and
turturica
committed

Commits on Aug 23, 2018

Merge branch 'master' of github.com:pytest-dev/pytest into fix-3854

turturica
authored and
turturica
committed
Fixes #3854

turturica
authored and
turturica
committed

Commits on Aug 24, 2018

Address #3796 and add a test for it.

turturica
authored and
turturica
committed
Make linting happy.

turturica
authored and
turturica
committed
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
Add encoding: utf8 for python 2.7

turturica
authored and
turturica
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

Fix the package fixture ordering in Windows.

turturica
authored and
turturica
committed
Make linting happy. Argh.

turturica
authored and
turturica
committed