Code

Fix #3854#3861

Code

Merged

nicoddemus merged 13 commits intopytest-dev:masterpytest-dev/pytest:masterfrom jonozzz:fix-3854jonozzz/pytest:fix-3854Copy head branch name to clipboardAug 25, 2018

+123-6

Commits

Commits on Aug 10, 2018

• Collect any tests from a package's __init__.py

  

  turturica

  authored and

  turturica

  committed
  d0bd01b

  Copy full SHA for d0bd01b

Commits on Aug 23, 2018

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

  

  turturica

  authored and

  turturica

  committed
  e4f76f6

  Copy full SHA for e4f76f6

• Fixes pytest-dev#3854

  

  turturica

  authored and

  turturica

  committed
  4d3c1ab

  Copy full SHA for 4d3c1ab

Commits on Aug 24, 2018

• Address pytest-dev#3796 and add a test for it.

  

  turturica

  authored and

  turturica

  committed
  5f8b50c

  Copy full SHA for 5f8b50c

• Make linting happy.

  

  turturica

  authored and

  turturica

  committed
  72e6482

  Copy full SHA for 72e6482

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

  

  turturica

  authored and

  turturica

  committed
  3396225

  Copy full SHA for 3396225

• Fix dedent after merge.

  

  turturica

  authored and

  turturica

  committed
  459b040

  Copy full SHA for 459b040

• Add encoding: utf8 for python 2.7

  

  turturica

  authored and

  turturica

  committed
  e3df103

  Copy full SHA for e3df103

• Added changelog items.

  

  turturica

  authored and

  turturica

  committed
  dce8df4

  Copy full SHA for dce8df4

• Fix test_package_ordering on Windows

  nicoddemus

  committed
  f0226e9

  Copy full SHA for f0226e9

• 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
  8cf0e46

  Copy full SHA for 8cf0e46

Commits on Aug 25, 2018

• Fix the package fixture ordering in Windows.

  

  turturica

  authored and

  turturica

  committed
  1e4ecda

  Copy full SHA for 1e4ecda

• Make linting happy. Argh.

  

  turturica

  authored and

  turturica

  committed
  c336449

  Copy full SHA for c336449