Fix typos in CHANGELOG

Preparing release version 3.7.0
Use proper quotes for python 3.7 on travis.yml
2018-07-30 18:31:35 -03:00 · 2018-07-30 20:14:42 +00:00 · 2018-07-30 20:13:17 +00:00 · 2018-07-30 20:12:52 +00:00 · 2018-07-30 20:12:30 +00:00 · 2018-07-30 17:09:18 -03:00
81 changed files with 1687 additions and 688 deletions
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -25,6 +25,10 @@ repos:
    rev: v1.2.0
    hooks:
    - id: pyupgrade
+-   repo: https://github.com/pre-commit/pygrep-hooks
+    rev: v1.0.0
+    hooks:
+    -   id: rst-backticks
 -   repo: local
    hooks:
    -   id: rst
@@ -34,8 +38,3 @@ repos:
        language: python
        additional_dependencies: [pygments, restructuredtext_lint]
        python_version: python3.6
-    -   id: rst-backticks
-        name: rst ``code`` is two backticks
-        entry: ' `[^`]+[^_]`([^_]|$)'
-        language: pygrep
-        types: [rst]
--- a/.travis.yml
+++ b/.travis.yml
@@ -41,7 +41,9 @@ jobs:
    - env: TOXENV=py36-freeze
      python: '3.6'
    - env: TOXENV=py37
-      python: 'nightly'
+      python: '3.7'
+      sudo: required
+      dist: xenial

    - stage: deploy
      python: '3.6'
--- a/4
+++ b/4
@@ -89,6 +89,7 @@ Hugo van Kemenade
 Hui Wang (coldnight)
 Ian Bicking
 Ian Lesperance
+Ionuț Turturică
 Jaap Broekhuizen
 Jan Balster
 Janne Vanhala
@@ -182,6 +183,7 @@ Ryan Wooden
 Samuel Dion-Girardeau
 Samuele Pedroni
 Segev Finer
+Serhii Mozghovyi
 Simon Gomizelj
 Skylar Downes
 Srinivas Reddy Thatiparthy
@@ -190,6 +192,7 @@ Stefan Zimmermann
 Stefano Taschini
 Steffen Allner
 Stephan Obermann
+Tadek Teleżyński
 Tarcisio Fischer
 Tareq Alayan
 Ted Xiao
@@ -206,6 +209,7 @@ Victor Uriarte
 Vidar T. Fauske
 Vitaly Lashmanov
 Vlad Dragos
+Wil Cooley
 William Lee
 Wouter van Ackooy
 Xuan Luong
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -8,6 +8,70 @@

 .. towncrier release notes start

+pytest 3.7.0 (2018-07-30)
+=========================
+
+Deprecations and Removals
+-------------------------
+
+- `#2639 <https://github.com/pytest-dev/pytest/issues/2639>`_: ``pytest_namespace`` has been deprecated.
+
+  See the documentation for ``pytest_namespace`` hook for suggestions on how to deal
+  with this in plugins which use this functionality.
+
+
+- `#3661 <https://github.com/pytest-dev/pytest/issues/3661>`_: Calling a fixture function directly, as opposed to request them in a test function, now issues a ``RemovedInPytest4Warning``. It will be changed into an error in pytest ``4.0``.
+
+  This is a great source of confusion to new users, which will often call the fixture functions and request them from test functions interchangeably, which breaks the fixture resolution model.
+
+
+
+Features
+--------
+
+- `#2283 <https://github.com/pytest-dev/pytest/issues/2283>`_: New ``package`` fixture scope: fixtures are finalized when the last test of a *package* finishes. This feature is considered **experimental**, so use it sparingly.
+
+
+- `#3576 <https://github.com/pytest-dev/pytest/issues/3576>`_: ``Node.add_marker`` now supports an ``append=True/False`` parameter to determine whether the mark comes last (default) or first.
+
+
+- `#3579 <https://github.com/pytest-dev/pytest/issues/3579>`_: Fixture ``caplog`` now has a ``messages`` property, providing convenient access to the format-interpolated log messages without the extra data provided by the formatter/handler.
+
+
+- `#3610 <https://github.com/pytest-dev/pytest/issues/3610>`_: New ``--trace`` option to enter the debugger at the start of a test.
+
+
+- `#3623 <https://github.com/pytest-dev/pytest/issues/3623>`_: Introduce ``pytester.copy_example`` as helper to do acceptance tests against examples from the project.
+
+
+
+Bug Fixes
+---------
+
+- `#2220 <https://github.com/pytest-dev/pytest/issues/2220>`_: Fix a bug where fixtures overridden by direct parameters (for example parametrization) were being instantiated even if they were not being used by a test.
+
+
+- `#3695 <https://github.com/pytest-dev/pytest/issues/3695>`_: Fix ``ApproxNumpy`` initialisation argument mixup, ``abs`` and ``rel`` tolerances were flipped causing strange comparsion results.
+  Add tests to check ``abs`` and ``rel`` tolerances for ``np.array`` and test for expecting ``nan`` with ``np.array()``
+
+
+- `#980 <https://github.com/pytest-dev/pytest/issues/980>`_: Fix truncated locals output in verbose mode.
+
+
+
+Improved Documentation
+----------------------
+
+- `#3295 <https://github.com/pytest-dev/pytest/issues/3295>`_: Correct the usage documentation of ``--last-failed-no-failures`` by adding the missing ``--last-failed`` argument in the presented examples, because they are misleading and lead to think that the missing argument is not needed.
+
+
+
+Trivial/Internal Changes
+------------------------
+
+- `#3519 <https://github.com/pytest-dev/pytest/issues/3519>`_: Now a ``README.md`` file is created in ``.pytest_cache`` to make it clear why the directory exists.
+
+
 pytest 3.6.4 (2018-07-28)
 =========================

@@ -35,7 +99,7 @@ Trivial/Internal Changes
 - Pin ``pluggy`` to ``<0.8``. (`#3727 <https://github.com/pytest-dev/pytest/issues/3727>`_)


-Pytest 3.6.3 (2018-07-04)
+pytest 3.6.3 (2018-07-04)
 =========================

 Bug Fixes
@@ -81,7 +145,7 @@ Trivial/Internal Changes
  <https://github.com/pytest-dev/pytest/issues/3653>`_)


-Pytest 3.6.2 (2018-06-20)
+pytest 3.6.2 (2018-06-20)
 =========================

 Bug Fixes
@@ -127,7 +191,7 @@ Trivial/Internal Changes
  <https://github.com/pytest-dev/pytest/issues/3567>`_)


-Pytest 3.6.1 (2018-06-05)
+pytest 3.6.1 (2018-06-05)
 =========================

 Bug Fixes
@@ -171,7 +235,7 @@ Trivial/Internal Changes
  <https://github.com/pytest-dev/pytest/issues/3529>`_)


-Pytest 3.6.0 (2018-05-23)
+pytest 3.6.0 (2018-05-23)
 =========================

 Features
@@ -257,7 +321,7 @@ Trivial/Internal Changes
  3.7 or newer. (`#3497 <https://github.com/pytest-dev/pytest/issues/3497>`_)


-Pytest 3.5.1 (2018-04-23)
+pytest 3.5.1 (2018-04-23)
 =========================


@@ -309,7 +373,7 @@ Trivial/Internal Changes
  <https://github.com/pytest-dev/pytest/issues/3398>`_)


-Pytest 3.5.0 (2018-03-21)
+pytest 3.5.0 (2018-03-21)
 =========================

 Deprecations and Removals
@@ -461,7 +525,7 @@ Trivial/Internal Changes
  <https://github.com/pytest-dev/pytest/issues/3308>`_)


-Pytest 3.4.2 (2018-03-04)
+pytest 3.4.2 (2018-03-04)
 =========================

 Bug Fixes
@@ -498,7 +562,7 @@ Trivial/Internal Changes
  <https://github.com/pytest-dev/pytest/issues/3259>`_)


-Pytest 3.4.1 (2018-02-20)
+pytest 3.4.1 (2018-02-20)
 =========================

 Bug Fixes
@@ -559,7 +623,7 @@ Trivial/Internal Changes
  <https://github.com/pytest-dev/pytest/issues/985>`_)


-Pytest 3.4.0 (2018-01-30)
+pytest 3.4.0 (2018-01-30)
 =========================

 Deprecations and Removals
@@ -691,7 +755,7 @@ Trivial/Internal Changes
  <https://github.com/pytest-dev/pytest/issues/3129>`_)


-Pytest 3.3.2 (2017-12-25)
+pytest 3.3.2 (2017-12-25)
 =========================

 Bug Fixes
@@ -728,7 +792,7 @@ Trivial/Internal Changes
  (`#3018 <https://github.com/pytest-dev/pytest/issues/3018>`_)


-Pytest 3.3.1 (2017-12-05)
+pytest 3.3.1 (2017-12-05)
 =========================

 Bug Fixes
@@ -770,13 +834,13 @@ Trivial/Internal Changes
  <https://github.com/pytest-dev/pytest/issues/2949>`_)


-Pytest 3.3.0 (2017-11-23)
+pytest 3.3.0 (2017-11-23)
 =========================

 Deprecations and Removals
 -------------------------

- Pytest no longer supports Python **2.6** and **3.3**. Those Python versions
+- pytest no longer supports Python **2.6** and **3.3**. Those Python versions
  are EOL for some time now and incur maintenance and compatibility costs on
  the pytest core team, and following up with the rest of the community we
  decided that they will no longer be supported starting on this version. Users
@@ -830,7 +894,7 @@ Features
 - Match ``warns`` signature to ``raises`` by adding ``match`` keyword. (`#2708
  <https://github.com/pytest-dev/pytest/issues/2708>`_)

- Pytest now captures and displays output from the standard ``logging`` module.
+- pytest now captures and displays output from the standard ``logging`` module.
  The user can control the logging level to be captured by specifying options
  in ``pytest.ini``, the command line and also during individual tests using
  markers. Also, a ``caplog`` fixture is available that enables users to test
@@ -895,7 +959,7 @@ Bug Fixes
  avoids a number of potential problems. (`#2751
  <https://github.com/pytest-dev/pytest/issues/2751>`_)

- Pytest no longer complains about warnings with unicode messages being
+- pytest no longer complains about warnings with unicode messages being
  non-ascii compatible even for ascii-compatible messages. As a result of this,
  warnings with unicode messages are converted first to an ascii representation
  for safety. (`#2809 <https://github.com/pytest-dev/pytest/issues/2809>`_)
@@ -947,7 +1011,7 @@ Trivial/Internal Changes
  <https://github.com/pytest-dev/pytest/issues/2922>`_)


-Pytest 3.2.5 (2017-11-15)
+pytest 3.2.5 (2017-11-15)
 =========================

 Bug Fixes
@@ -958,7 +1022,7 @@ Bug Fixes
  <https://github.com/pytest-dev/pytest/issues/2926>`_)


-Pytest 3.2.4 (2017-11-13)
+pytest 3.2.4 (2017-11-13)
 =========================

 Bug Fixes
@@ -1007,7 +1071,7 @@ Improved Documentation
  <https://github.com/pytest-dev/pytest/issues/911>`_)


-Pytest 3.2.3 (2017-10-03)
+pytest 3.2.3 (2017-10-03)
 =========================

 Bug Fixes
@@ -1047,7 +1111,7 @@ Trivial/Internal Changes
  (`#2765 <https://github.com/pytest-dev/pytest/issues/2765>`_)


-Pytest 3.2.2 (2017-09-06)
+pytest 3.2.2 (2017-09-06)
 =========================

 Bug Fixes
@@ -1094,7 +1158,7 @@ Trivial/Internal Changes
  <https://github.com/pytest-dev/pytest/issues/2739>`_)


-Pytest 3.2.1 (2017-08-08)
+pytest 3.2.1 (2017-08-08)
 =========================

 Bug Fixes
@@ -1124,7 +1188,7 @@ Improved Documentation
  <https://github.com/pytest-dev/pytest/issues/2626>`_)


-Pytest 3.2.0 (2017-07-30)
+pytest 3.2.0 (2017-07-30)
 =========================

 Deprecations and Removals
@@ -1290,7 +1354,7 @@ Trivial/Internal Changes
  <https://github.com/pytest-dev/pytest/issues/2620>`_)


-Pytest 3.1.3 (2017-07-03)
+pytest 3.1.3 (2017-07-03)
 =========================

 Bug Fixes
@@ -1336,7 +1400,7 @@ Trivial/Internal Changes
  (`#2499 <https://github.com/pytest-dev/pytest/issues/2499>`_)


-Pytest 3.1.2 (2017-06-08)
+pytest 3.1.2 (2017-06-08)
 =========================

 Bug Fixes
@@ -1368,7 +1432,7 @@ Improved Documentation
  and improve overall flow of the ``skipping`` docs. (#810)


-Pytest 3.1.1 (2017-05-30)
+pytest 3.1.1 (2017-05-30)
 =========================

 Bug Fixes
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -14,7 +14,8 @@ environment:
  - TOXENV: "py34"
  - TOXENV: "py35"
  - TOXENV: "py36"
-  - TOXENV: "pypy"
+  - TOXENV: "py37"
+#  - TOXENV: "pypy" reenable when we are able to provide a scandir wheel or build scandir
  - TOXENV: "py27-pexpect"
  - TOXENV: "py27-xdist"
  - TOXENV: "py27-trial"
--- a/changelog/README.rst
+++ b/changelog/README.rst
@@ -26,7 +26,7 @@ changelog using that instead.

 If you are not sure what issue type to use, don't hesitate to ask in your PR.

-Note that the ``towncrier`` tool will automatically
-reflow your text, so it will work best if you stick to a single paragraph, but multiple sentences and links are OK
-and encouraged. You can install ``towncrier`` and then run ``towncrier --draft``
+``towncrier`` preserves multiple paragraphs and formatting (code blocks, lists, and so on), but for entries
+other than ``features`` it is usually better to stick to a single paragraph to keep it concise. You can install
+``towncrier`` and then run ``towncrier --draft``
 if you want to get a preview of how your change will look in the final release notes.
--- a/changelog/_template.rst
+++ b/changelog/_template.rst
@@ -14,7 +14,7 @@
 {% if definitions[category]['showcontent'] %}
 {% for text, values in sections[section][category]|dictsort(by='value') %}
 {% set issue_joiner = joiner(', ') %}
- {{ text }}{% if category != 'vendor' %} ({% for value in values|sort %}{{ issue_joiner() }}`{{ value }} <https://github.com/pytest-dev/pytest/issues/{{ value[1:] }}>`_{% endfor %}){% endif %}
+- {% for value in values|sort %}{{ issue_joiner() }}`{{ value }} <https://github.com/pytest-dev/pytest/issues/{{ value[1:] }}>`_{% endfor %}: {{ text }}


 {% endfor %}
--- a/doc/en/announce/index.rst
+++ b/doc/en/announce/index.rst
@@ -6,6 +6,7 @@ Release announcements
   :maxdepth: 2


+   release-3.7.0
   release-3.6.4
   release-3.6.3
   release-3.6.2
--- a/doc/en/announce/release-3.7.0.rst
+++ b/doc/en/announce/release-3.7.0.rst
@@ -0,0 +1,41 @@
+pytest-3.7.0
+=======================================
+
+The pytest team is proud to announce the 3.7.0 release!
+
+pytest is a mature Python testing tool with more than a 2000 tests
+against itself, passing on many different interpreters and platforms.
+
+This release contains a number of bugs fixes and improvements, so users are encouraged
+to take a look at the CHANGELOG:
+
+    http://doc.pytest.org/en/latest/changelog.html
+
+For complete documentation, please visit:
+
+    http://docs.pytest.org
+
+As usual, you can upgrade from pypi via:
+
+    pip install -U pytest
+
+Thanks to all who contributed to this release, among them:
+
+* Alan
+* Alan Brammer
+* Ammar Najjar
+* Anthony Sottile
+* Bruno Oliveira
+* Jeffrey Rackauckas
+* Kale Kundert
+* Ronny Pfannschmidt
+* Serhii Mozghovyi
+* Tadek Teleżyński
+* Wil Cooley
+* abrammer
+* avirlrma
+* turturica
+
+
+Happy testing,
+The Pytest Development Team
--- a/doc/en/cache.rst
+++ b/doc/en/cache.rst
@@ -162,8 +162,8 @@ When no tests failed in the last run, or when no cached ``lastfailed`` data was
 found, ``pytest`` can be configured either to run all of the tests or no tests,
 using the ``--last-failed-no-failures`` option, which takes one of the following values::

-    pytest --last-failed-no-failures all    # run all tests (default behavior)
-    pytest --last-failed-no-failures none   # run no tests and exit
+    pytest --last-failed --last-failed-no-failures all    # run all tests (default behavior)
+    pytest --last-failed --last-failed-no-failures none   # run no tests and exit

 The new config.cache object
 --------------------------------
--- a/doc/en/example/markers.rst
+++ b/doc/en/example/markers.rst
@@ -31,7 +31,7 @@ You can then restrict a test run to only run tests marked with ``webtest``::

    $ pytest -v -m webtest
    =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-3.x.y, py-1.x.y, pluggy-0.x.y -- $PYTHON_PREFIX/bin/python3.5
+    platform linux -- Python 3.x.y, pytest-3.x.y, py-1.x.y, pluggy-0.x.y -- $PYTHON_PREFIX/bin/python3.6
    cachedir: .pytest_cache
    rootdir: $REGENDOC_TMPDIR, inifile:
    collecting ... collected 4 items / 3 deselected
@@ -44,7 +44,7 @@ Or the inverse, running all tests except the webtest ones::

    $ pytest -v -m "not webtest"
    =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-3.x.y, py-1.x.y, pluggy-0.x.y -- $PYTHON_PREFIX/bin/python3.5
+    platform linux -- Python 3.x.y, pytest-3.x.y, py-1.x.y, pluggy-0.x.y -- $PYTHON_PREFIX/bin/python3.6
    cachedir: .pytest_cache
    rootdir: $REGENDOC_TMPDIR, inifile:
    collecting ... collected 4 items / 1 deselected
@@ -64,7 +64,7 @@ tests based on their module, class, method, or function name::

    $ pytest -v test_server.py::TestClass::test_method
    =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-3.x.y, py-1.x.y, pluggy-0.x.y -- $PYTHON_PREFIX/bin/python3.5
+    platform linux -- Python 3.x.y, pytest-3.x.y, py-1.x.y, pluggy-0.x.y -- $PYTHON_PREFIX/bin/python3.6
    cachedir: .pytest_cache
    rootdir: $REGENDOC_TMPDIR, inifile:
    collecting ... collected 1 item
@@ -77,7 +77,7 @@ You can also select on the class::

    $ pytest -v test_server.py::TestClass
    =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-3.x.y, py-1.x.y, pluggy-0.x.y -- $PYTHON_PREFIX/bin/python3.5
+    platform linux -- Python 3.x.y, pytest-3.x.y, py-1.x.y, pluggy-0.x.y -- $PYTHON_PREFIX/bin/python3.6
    cachedir: .pytest_cache
    rootdir: $REGENDOC_TMPDIR, inifile:
    collecting ... collected 1 item
@@ -90,7 +90,7 @@ Or select multiple nodes::

  $ pytest -v test_server.py::TestClass test_server.py::test_send_http
  =========================== test session starts ============================
-  platform linux -- Python 3.x.y, pytest-3.x.y, py-1.x.y, pluggy-0.x.y -- $PYTHON_PREFIX/bin/python3.5
+  platform linux -- Python 3.x.y, pytest-3.x.y, py-1.x.y, pluggy-0.x.y -- $PYTHON_PREFIX/bin/python3.6
  cachedir: .pytest_cache
  rootdir: $REGENDOC_TMPDIR, inifile:
  collecting ... collected 2 items
@@ -128,7 +128,7 @@ select tests based on their names::

    $ pytest -v -k http  # running with the above defined example module
    =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-3.x.y, py-1.x.y, pluggy-0.x.y -- $PYTHON_PREFIX/bin/python3.5
+    platform linux -- Python 3.x.y, pytest-3.x.y, py-1.x.y, pluggy-0.x.y -- $PYTHON_PREFIX/bin/python3.6
    cachedir: .pytest_cache
    rootdir: $REGENDOC_TMPDIR, inifile:
    collecting ... collected 4 items / 3 deselected
@@ -141,7 +141,7 @@ And you can also run all tests except the ones that match the keyword::

    $ pytest -k "not send_http" -v
    =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-3.x.y, py-1.x.y, pluggy-0.x.y -- $PYTHON_PREFIX/bin/python3.5
+    platform linux -- Python 3.x.y, pytest-3.x.y, py-1.x.y, pluggy-0.x.y -- $PYTHON_PREFIX/bin/python3.6
    cachedir: .pytest_cache
    rootdir: $REGENDOC_TMPDIR, inifile:
    collecting ... collected 4 items / 1 deselected
@@ -156,7 +156,7 @@ Or to select "http" and "quick" tests::

    $ pytest -k "http or quick" -v
    =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-3.x.y, py-1.x.y, pluggy-0.x.y -- $PYTHON_PREFIX/bin/python3.5
+    platform linux -- Python 3.x.y, pytest-3.x.y, py-1.x.y, pluggy-0.x.y -- $PYTHON_PREFIX/bin/python3.6
    cachedir: .pytest_cache
    rootdir: $REGENDOC_TMPDIR, inifile:
    collecting ... collected 4 items / 2 deselected
--- a/doc/en/example/nonpython.rst
+++ b/doc/en/example/nonpython.rst
@@ -59,7 +59,7 @@ consulted when reporting in ``verbose`` mode::

    nonpython $ pytest -v
    =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-3.x.y, py-1.x.y, pluggy-0.x.y -- $PYTHON_PREFIX/bin/python3.5
+    platform linux -- Python 3.x.y, pytest-3.x.y, py-1.x.y, pluggy-0.x.y -- $PYTHON_PREFIX/bin/python3.6
    cachedir: .pytest_cache
    rootdir: $REGENDOC_TMPDIR/nonpython, inifile:
    collecting ... collected 2 items
@@ -84,8 +84,9 @@ interesting to just look at the collection tree::
    platform linux -- Python 3.x.y, pytest-3.x.y, py-1.x.y, pluggy-0.x.y
    rootdir: $REGENDOC_TMPDIR/nonpython, inifile:
    collected 2 items
-    <YamlFile 'test_simple.yml'>
-      <YamlItem 'hello'>
-      <YamlItem 'ok'>
+    <Package '$REGENDOC_TMPDIR/nonpython'>
+      <YamlFile 'test_simple.yml'>
+        <YamlItem 'hello'>
+        <YamlItem 'ok'>

    ======================= no tests ran in 0.12 seconds =======================
--- a/doc/en/example/reportingdemo.rst
+++ b/doc/en/example/reportingdemo.rst
@@ -363,7 +363,7 @@ get on the terminal - we are working on that)::
    >   int(s)
    E   ValueError: invalid literal for int() with base 10: 'qwe'

-    <0-codegen $PYTHON_PREFIX/lib/python3.5/site-packages/_pytest/python_api.py:635>:1: ValueError
+    <0-codegen $PYTHON_PREFIX/lib/python3.6/site-packages/_pytest/python_api.py:635>:1: ValueError
    ______________________ TestRaises.test_raises_doesnt _______________________

    self = <failure_demo.TestRaises object at 0xdeadbeef>
--- a/doc/en/example/simple.rst
+++ b/doc/en/example/simple.rst
@@ -357,7 +357,7 @@ which will add info only when run with "--v"::

    $ pytest -v
    =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-3.x.y, py-1.x.y, pluggy-0.x.y -- $PYTHON_PREFIX/bin/python3.5
+    platform linux -- Python 3.x.y, pytest-3.x.y, py-1.x.y, pluggy-0.x.y -- $PYTHON_PREFIX/bin/python3.6
    cachedir: .pytest_cache
    info1: did you know that ...
    did you?
--- a/doc/en/fixture.rst
+++ b/doc/en/fixture.rst
@@ -259,6 +259,22 @@ instance, you can simply declare it:
 Finally, the ``class`` scope will invoke the fixture once per test *class*.


+``package`` scope (experimental)
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. versionadded:: 3.7
+
+In pytest 3.7 the ``package`` scope has been introduced. Package-scoped fixtures
+are finalized when the last test of a *package* finishes.
+
+.. warning::
+    This functionality is considered **experimental** and may be removed in future
+    versions if hidden corner-cases or serious problems with this functionality
+    are discovered after it gets more usage in the wild.
+
+    Use this new feature sparingly and please make sure to report any issues you find.
+
+
 Higher-scoped fixtures are instantiated first
 ---------------------------------------------

@@ -710,7 +726,7 @@ Running this test will *skip* the invocation of ``data_set`` with value ``2``::

    $ pytest test_fixture_marks.py -v
    =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-3.x.y, py-1.x.y, pluggy-0.x.y -- $PYTHON_PREFIX/bin/python3.5
+    platform linux -- Python 3.x.y, pytest-3.x.y, py-1.x.y, pluggy-0.x.y -- $PYTHON_PREFIX/bin/python3.6
    cachedir: .pytest_cache
    rootdir: $REGENDOC_TMPDIR, inifile:
    collecting ... collected 3 items
@@ -753,7 +769,7 @@ Here we declare an ``app`` fixture which receives the previously defined

    $ pytest -v test_appsetup.py
    =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-3.x.y, py-1.x.y, pluggy-0.x.y -- $PYTHON_PREFIX/bin/python3.5
+    platform linux -- Python 3.x.y, pytest-3.x.y, py-1.x.y, pluggy-0.x.y -- $PYTHON_PREFIX/bin/python3.6
    cachedir: .pytest_cache
    rootdir: $REGENDOC_TMPDIR, inifile:
    collecting ... collected 2 items
@@ -822,7 +838,7 @@ Let's run the tests in verbose mode and with looking at the print-output::

    $ pytest -v -s test_module.py
    =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-3.x.y, py-1.x.y, pluggy-0.x.y -- $PYTHON_PREFIX/bin/python3.5
+    platform linux -- Python 3.x.y, pytest-3.x.y, py-1.x.y, pluggy-0.x.y -- $PYTHON_PREFIX/bin/python3.6
    cachedir: .pytest_cache
    rootdir: $REGENDOC_TMPDIR, inifile:
    collecting ... collected 8 items
--- a/doc/en/getting-started.rst
+++ b/doc/en/getting-started.rst
@@ -27,7 +27,7 @@ Install ``pytest``
 2. Check that you installed the correct version::

    $ pytest --version
-    This is pytest version 3.x.y, imported from $PYTHON_PREFIX/lib/python3.5/site-packages/pytest.py
+    This is pytest version 3.x.y, imported from $PYTHON_PREFIX/lib/python3.6/site-packages/pytest.py

 .. _`simpletest`:

--- a/doc/en/reference.rst
+++ b/doc/en/reference.rst
@@ -787,7 +787,7 @@ TestReport
 _Result
 ~~~~~~~

-.. autoclass:: pluggy._Result
+.. autoclass:: pluggy.callers._Result
    :members:

 Special Variables
--- a/doc/en/usage.rst
+++ b/doc/en/usage.rst
@@ -171,6 +171,18 @@ for example::
    >>> sys.last_value
    AssertionError('assert result == "ok"',)

+.. _trace-option:
+
+Dropping to PDB_ (Python Debugger) at the start of a test
+----------------------------------------------------------
+
+
+``pytest`` allows one to drop into the PDB_ prompt immediately at the start of each test via a command line option::
+
+    pytest --trace
+
+This will invoke the Python debugger at the start of every test.
+
 .. _breakpoints:

 Setting breakpoints
--- a/doc/en/writing_plugins.rst
+++ b/doc/en/writing_plugins.rst
@@ -386,11 +386,52 @@ return a result object, with which we can assert the tests' outcomes.
        result.assert_outcomes(passed=4)


+additionally it is possible to copy examples for a example folder before running pytest on it
+
+.. code:: ini
+
+  # content of pytest.ini
+  [pytest]
+  pytester_example_dir = .
+
+
+.. code:: python
+
+    # content of test_example.py
+
+
+    def test_plugin(testdir):
+      testdir.copy_example("test_example.py")
+      testdir.runpytest("-k", "test_example")
+
+    def test_example():
+      pass
+
+.. code::
+
+    $ pytest
+    =========================== test session starts ============================
+    platform linux -- Python 3.x.y, pytest-3.x.y, py-1.x.y, pluggy-0.x.y
+    rootdir: $REGENDOC_TMPDIR, inifile: pytest.ini
+    collected 2 items
+
+    test_example.py ..                                                   [100%]
+
+    ============================= warnings summary =============================
+    test_example.py::test_plugin
+      $REGENDOC_TMPDIR/test_example.py:4: PytestExerimentalApiWarning: testdir.copy_example is an experimental api that may change over time
+        testdir.copy_example("test_example.py")
+
+    -- Docs: http://doc.pytest.org/en/latest/warnings.html
+    =================== 2 passed, 1 warnings in 0.12 seconds ===================
+
 For more information about the result object that ``runpytest()`` returns, and
 the methods that it provides please check out the :py:class:`RunResult
 <_pytest.pytester.RunResult>` documentation.


+
+
 .. _`writinghooks`:

 Writing hook functions
--- a/setup.py
+++ b/setup.py
@@ -69,19 +69,23 @@ def main():
    # if _PYTEST_SETUP_SKIP_PLUGGY_DEP is set, skip installing pluggy;
    # used by tox.ini to test with pluggy master
    if "_PYTEST_SETUP_SKIP_PLUGGY_DEP" not in os.environ:
-        install_requires.append("pluggy>=0.5,<0.8")
+        install_requires.append("pluggy>=0.7")
    environment_marker_support_level = get_environment_marker_support_level()
    if environment_marker_support_level >= 2:
        install_requires.append('funcsigs;python_version<"3.0"')
+        install_requires.append('pathlib2;python_version<"3.6"')
        install_requires.append('colorama;sys_platform=="win32"')
    elif environment_marker_support_level == 1:
        extras_require[':python_version<"3.0"'] = ["funcsigs"]
+        extras_require[':python_version<"3.6"'] = ["pathlib2"]
        extras_require[':sys_platform=="win32"'] = ["colorama"]
    else:
        if sys.platform == "win32":
            install_requires.append("colorama")
        if sys.version_info < (3, 0):
            install_requires.append("funcsigs")
+        if sys.version_info < (3, 6):
+            install_requires.append("pathlib2")

    setup(
        name="pytest",
--- a/src/_pytest/_code/code.py
+++ b/src/_pytest/_code/code.py
@@ -1,5 +1,6 @@
 from __future__ import absolute_import, division, print_function
 import inspect
+import pprint
 import sys
 import traceback
 from inspect import CO_VARARGS, CO_VARKEYWORDS
@@ -448,6 +449,7 @@ class ExceptionInfo(object):
        abspath=False,
        tbfilter=True,
        funcargs=False,
+        truncate_locals=True,
    ):
        """ return str()able representation of this exception info.
            showlocals: show locals per traceback entry
@@ -472,6 +474,7 @@ class ExceptionInfo(object):
            abspath=abspath,
            tbfilter=tbfilter,
            funcargs=funcargs,
+            truncate_locals=truncate_locals,
        )
        return fmt.repr_excinfo(self)

@@ -511,6 +514,7 @@ class FormattedExcinfo(object):
    abspath = attr.ib(default=True)
    tbfilter = attr.ib(default=True)
    funcargs = attr.ib(default=False)
+    truncate_locals = attr.ib(default=True)
    astcache = attr.ib(default=attr.Factory(dict), init=False, repr=False)

    def _getindent(self, source):
@@ -593,7 +597,10 @@ class FormattedExcinfo(object):
                    # This formatting could all be handled by the
                    # _repr() function, which is only reprlib.Repr in
                    # disguise, so is very configurable.
-                    str_repr = self._saferepr(value)
+                    if self.truncate_locals:
+                        str_repr = self._saferepr(value)
+                    else:
+                        str_repr = pprint.pformat(value)
                    # if len(str_repr) < 70 or not isinstance(value,
                    #                            (list, tuple, dict)):
                    lines.append("%-10s = %s" % (name, str_repr))
--- a/src/_pytest/cacheprovider.py
+++ b/src/_pytest/cacheprovider.py
@@ -5,38 +5,50 @@ the name cache was not chosen to ensure pluggy automatically
 ignores the external pytest-cache
 """
 from __future__ import absolute_import, division, print_function
-
 from collections import OrderedDict

 import py
 import six
+import attr

 import pytest
 import json
-import os
-from os.path import sep as _sep, altsep as _altsep
+import shutil
+
+from . import paths
+from .compat import _PY2 as PY2, Path
+
+README_CONTENT = u"""\
+# pytest cache directory #
+
+This directory contains data from the pytest's cache plugin,
+which provides the `--lf` and `--ff` options, as well as the `cache` fixture.
+
+**Do not** commit this to version control.
+
+See [the docs](https://docs.pytest.org/en/latest/cache.html) for more information.
+"""


+@attr.s
 class Cache(object):
-    def __init__(self, config):
-        self.config = config
-        self._cachedir = Cache.cache_dir_from_config(config)
-        self.trace = config.trace.root.get("cache")
-        if config.getoption("cacheclear"):
-            self.trace("clearing cachedir")
-            if self._cachedir.check():
-                self._cachedir.remove()
-            self._cachedir.mkdir()
+    _cachedir = attr.ib(repr=False)
+    _warn = attr.ib(repr=False)
+
+    @classmethod
+    def for_config(cls, config):
+        cachedir = cls.cache_dir_from_config(config)
+        if config.getoption("cacheclear") and cachedir.exists():
+            shutil.rmtree(str(cachedir))
+            cachedir.mkdir()
+        return cls(cachedir, config.warn)

    @staticmethod
    def cache_dir_from_config(config):
-        cache_dir = config.getini("cache_dir")
-        cache_dir = os.path.expanduser(cache_dir)
-        cache_dir = os.path.expandvars(cache_dir)
-        if os.path.isabs(cache_dir):
-            return py.path.local(cache_dir)
-        else:
-            return config.rootdir.join(cache_dir)
+        return paths.resolve_from_str(config.getini("cache_dir"), config.rootdir)
+
+    def warn(self, fmt, **args):
+        self._warn(code="I9", message=fmt.format(**args) if args else fmt)

    def makedir(self, name):
        """ return a directory path object with the given name.  If the
@@ -48,12 +60,15 @@ class Cache(object):
             Make sure the name contains your plugin or application
             identifiers to prevent clashes with other cache users.
        """
-        if _sep in name or _altsep is not None and _altsep in name:
+        name = Path(name)
+        if len(name.parts) > 1:
            raise ValueError("name is not allowed to contain path separators")
-        return self._cachedir.ensure_dir("d", name)
+        res = self._cachedir.joinpath("d", name)
+        res.mkdir(exist_ok=True, parents=True)
+        return py.path.local(res)

    def _getvaluepath(self, key):
-        return self._cachedir.join("v", *key.split("/"))
+        return self._cachedir.joinpath("v", Path(key))

    def get(self, key, default):
        """ return cached value for the given key.  If no value
@@ -67,13 +82,11 @@ class Cache(object):

        """
        path = self._getvaluepath(key)
-        if path.check():
-            try:
-                with path.open("r") as f:
-                    return json.load(f)
-            except ValueError:
-                self.trace("cache-invalid at %s" % (path,))
-        return default
+        try:
+            with path.open("r") as f:
+                return json.load(f)
+        except (ValueError, IOError, OSError):
+            return default

    def set(self, key, value):
        """ save value for the given key.
@@ -86,22 +99,25 @@ class Cache(object):
        """
        path = self._getvaluepath(key)
        try:
-            path.dirpath().ensure_dir()
-        except (py.error.EEXIST, py.error.EACCES):
-            self.config.warn(
-                code="I9", message="could not create cache path %s" % (path,)
-            )
+            path.parent.mkdir(exist_ok=True, parents=True)
+        except (IOError, OSError):
+            self.warn("could not create cache path {path}", path=path)
            return
        try:
-            f = path.open("w")
-        except py.error.ENOTDIR:
-            self.config.warn(
-                code="I9", message="cache could not write path %s" % (path,)
-            )
+            f = path.open("wb" if PY2 else "w")
+        except (IOError, OSError):
+            self.warn("cache could not write path {path}", path=path)
        else:
            with f:
-                self.trace("cache-write %s: %r" % (key, value))
                json.dump(value, f, indent=2, sort_keys=True)
+                self._ensure_readme()
+
+    def _ensure_readme(self):
+
+        if self._cachedir.is_dir():
+            readme_path = self._cachedir / "README.md"
+            if not readme_path.is_file():
+                readme_path.write_text(README_CONTENT)


 class LFPlugin(object):
@@ -273,7 +289,7 @@ def pytest_cmdline_main(config):

@pytest.hookimpl(tryfirst=True)
 def pytest_configure(config):
-    config.cache = Cache(config)
+    config.cache = Cache.for_config(config)
    config.pluginmanager.register(LFPlugin(config), "lfplugin")
    config.pluginmanager.register(NFPlugin(config), "nfplugin")

@@ -296,41 +312,40 @@ def cache(request):

 def pytest_report_header(config):
    if config.option.verbose:
-        relpath = py.path.local().bestrelpath(config.cache._cachedir)
-        return "cachedir: %s" % relpath
+        relpath = config.cache._cachedir.relative_to(config.rootdir)
+        return "cachedir: {}".format(relpath)


 def cacheshow(config, session):
-    from pprint import pprint
+    from pprint import pformat

    tw = py.io.TerminalWriter()
    tw.line("cachedir: " + str(config.cache._cachedir))
-    if not config.cache._cachedir.check():
+    if not config.cache._cachedir.is_dir():
        tw.line("cache is empty")
        return 0
    dummy = object()
    basedir = config.cache._cachedir
-    vdir = basedir.join("v")
+    vdir = basedir / "v"
    tw.sep("-", "cache values")
-    for valpath in sorted(vdir.visit(lambda x: x.isfile())):
-        key = valpath.relto(vdir).replace(valpath.sep, "/")
+    for valpath in sorted(x for x in vdir.rglob("*") if x.is_file()):
+        key = valpath.relative_to(vdir)
        val = config.cache.get(key, dummy)
        if val is dummy:
            tw.line("%s contains unreadable content, " "will be ignored" % key)
        else:
            tw.line("%s contains:" % key)
-            stream = py.io.TextIO()
-            pprint(val, stream=stream)
-            for line in stream.getvalue().splitlines():
+            for line in pformat(val).splitlines():
                tw.line("  " + line)

-    ddir = basedir.join("d")
-    if ddir.isdir() and ddir.listdir():
+    ddir = basedir / "d"
+    if ddir.is_dir():
+        contents = sorted(ddir.rglob("*"))
        tw.sep("-", "cache directories")
-        for p in sorted(basedir.join("d").visit()):
+        for p in contents:
            # if p.check(dir=1):
            #    print("%s/" % p.relto(basedir))
-            if p.isfile():
-                key = p.relto(basedir)
-                tw.line("%s is a file of length %d" % (key, p.size()))
+            if p.is_file():
+                key = p.relative_to(basedir)
+                tw.line("{} is a file of length {:d}".format(key, p.stat().st_size))
    return 0
--- a/src/_pytest/compat.py
+++ b/src/_pytest/compat.py
@@ -22,6 +22,7 @@ except ImportError:  # pragma: no cover
    # Only available in Python 3.4+ or as a backport
    enum = None

+__all__ = ["Path"]

 _PY3 = sys.version_info > (3, 0)
 _PY2 = not _PY3
@@ -32,7 +33,6 @@ if _PY3:
 else:
    from funcsigs import signature, Parameter as Parameter

-
 NoneType = type(None)
 NOTSET = object()

@@ -40,6 +40,12 @@ PY35 = sys.version_info[:2] >= (3, 5)
 PY36 = sys.version_info[:2] >= (3, 6)
 MODULE_NOT_FOUND_ERROR = "ModuleNotFoundError" if PY36 else "ImportError"

+if PY36:
+    from pathlib import Path
+else:
+    from pathlib2 import Path
+
+
 if _PY3:
    from collections.abc import MutableMapping as MappingMixin
    from collections.abc import Mapping, Sequence
@@ -78,6 +84,7 @@ def iscoroutinefunction(func):


 def getlocation(function, curdir):
+    function = get_real_func(function)
    fn = py.path.local(inspect.getfile(function))
    lineno = function.__code__.co_firstlineno
    if fn.relto(curdir):
--- a/src/_pytest/debugging.py
+++ b/src/_pytest/debugging.py
@@ -5,6 +5,8 @@ import sys
 import os
 from doctest import UnexpectedException

+from _pytest.config import hookimpl
+
 try:
    from builtins import breakpoint  # noqa

@@ -28,6 +30,12 @@ def pytest_addoption(parser):
        help="start a custom interactive Python debugger on errors. "
        "For example: --pdbcls=IPython.terminal.debugger:TerminalPdb",
    )
+    group._addoption(
+        "--trace",
+        dest="trace",
+        action="store_true",
+        help="Immediately break when running each test.",
+    )


 def pytest_configure(config):
@@ -38,6 +46,8 @@ def pytest_configure(config):
    else:
        pdb_cls = pdb.Pdb

+    if config.getvalue("trace"):
+        config.pluginmanager.register(PdbTrace(), "pdbtrace")
    if config.getvalue("usepdb"):
        config.pluginmanager.register(PdbInvoke(), "pdbinvoke")

@@ -71,7 +81,7 @@ class pytestPDB(object):
    _pdb_cls = pdb.Pdb

    @classmethod
-    def set_trace(cls):
+    def set_trace(cls, set_break=True):
        """ invoke PDB set_trace debugging, dropping any IO capturing. """
        import _pytest.config

@@ -84,7 +94,8 @@ class pytestPDB(object):
            tw.line()
            tw.sep(">", "PDB set_trace (IO-capturing turned off)")
            cls._pluginmanager.hook.pytest_enter_pdb(config=cls._config)
-        cls._pdb_cls().set_trace(frame)
+        if set_break:
+            cls._pdb_cls().set_trace(frame)


 class PdbInvoke(object):
@@ -104,6 +115,30 @@ class PdbInvoke(object):
        post_mortem(tb)


+class PdbTrace(object):
+    @hookimpl(hookwrapper=True)
+    def pytest_pyfunc_call(self, pyfuncitem):
+        _test_pytest_function(pyfuncitem)
+        yield
+
+
+def _test_pytest_function(pyfuncitem):
+    pytestPDB.set_trace(set_break=False)
+    testfunction = pyfuncitem.obj
+    pyfuncitem.obj = pdb.runcall
+    if pyfuncitem._isyieldedfunction():
+        arg_list = list(pyfuncitem._args)
+        arg_list.insert(0, testfunction)
+        pyfuncitem._args = tuple(arg_list)
+    else:
+        if "func" in pyfuncitem._fixtureinfo.argnames:
+            raise ValueError("--trace can't be used with a fixture named func!")
+        pyfuncitem.funcargs["func"] = testfunction
+        new_list = list(pyfuncitem._fixtureinfo.argnames)
+        new_list.append("func")
+        pyfuncitem._fixtureinfo.argnames = tuple(new_list)
+
+
 def _enter_pdb(node, excinfo, rep):
    # XXX we re-use the TerminalReporter's terminalwriter
    # because this seems to avoid some encoding related troubles
--- a/src/_pytest/deprecated.py
+++ b/src/_pytest/deprecated.py
@@ -22,6 +22,12 @@ FUNCARG_PREFIX = (
    "Please remove the prefix and use the @pytest.fixture decorator instead."
 )

+FIXTURE_FUNCTION_CALL = (
+    "Fixture {name} called directly. Fixtures are not meant to be called directly, "
+    "are created automatically when test functions request them as parameters. "
+    "See https://docs.pytest.org/en/latest/fixture.html for more information."
+)
+
 CFG_PYTEST_SECTION = (
    "[pytest] section in {filename} files is deprecated, use [tool:pytest] instead."
 )
@@ -65,3 +71,7 @@ PYTEST_PLUGINS_FROM_NON_TOP_LEVEL_CONFTEST = RemovedInPytest4Warning(
    "because it affects the entire directory tree in a non-explicit way.\n"
    "Please move it to the top level conftest file instead."
 )
+
+PYTEST_NAMESPACE = RemovedInPytest4Warning(
+    "pytest_namespace is deprecated and will be removed soon"
+)
--- a/src/_pytest/experiments.py
+++ b/src/_pytest/experiments.py
@@ -0,0 +1,13 @@
+class PytestExerimentalApiWarning(FutureWarning):
+    "warning category used to denote experiments in pytest"
+
+    @classmethod
+    def simple(cls, apiname):
+        return cls(
+            "{apiname} is an experimental api that may change over time".format(
+                apiname=apiname
+            )
+        )
+
+
+PYTESTER_COPY_EXAMPLE = PytestExerimentalApiWarning.simple("testdir.copy_example")
--- a/src/_pytest/fixtures.py
+++ b/src/_pytest/fixtures.py
@@ -2,9 +2,12 @@ from __future__ import absolute_import, division, print_function

 import functools
 import inspect
+import os
 import sys
 import warnings
 from collections import OrderedDict, deque, defaultdict
+
+import six
 from more_itertools import flatten

 import attr
@@ -28,6 +31,7 @@ from _pytest.compat import (
    safe_getattr,
    FuncargnamesCompatAttr,
 )
+from _pytest.deprecated import FIXTURE_FUNCTION_CALL, RemovedInPytest4Warning
 from _pytest.outcomes import fail, TEST_OUTCOME

 FIXTURE_MSG = 'fixtures cannot have "pytest_funcarg__" prefix and be decorated with @pytest.fixture:\n{}'
@@ -45,6 +49,7 @@ def pytest_sessionstart(session):

    scopename2class.update(
        {
+            "package": _pytest.python.Package,
            "class": _pytest.python.Class,
            "module": _pytest.python.Module,
            "function": _pytest.nodes.Item,
@@ -58,6 +63,7 @@ scopename2class = {}


 scope2props = dict(session=())
+scope2props["package"] = ("fspath",)
 scope2props["module"] = ("fspath", "module")
 scope2props["class"] = scope2props["module"] + ("cls",)
 scope2props["instance"] = scope2props["class"] + ("instance",)
@@ -80,6 +86,21 @@ def scopeproperty(name=None, doc=None):
    return decoratescope


+def get_scope_package(node, fixturedef):
+    import pytest
+
+    cls = pytest.Package
+    current = node
+    fixture_package_name = os.path.join(fixturedef.baseid, "__init__.py")
+    while current and (
+        type(current) is not cls or fixture_package_name != current.nodeid
+    ):
+        current = current.parent
+    if current is None:
+        return node.session
+    return current
+
+
 def get_scope_node(node, scope):
    cls = scopename2class.get(scope)
    if cls is None:
@@ -173,9 +194,11 @@ def get_parametrized_fixture_keys(item, scopenum):
                continue
            if scopenum == 0:  # session
                key = (argname, param_index)
-            elif scopenum == 1:  # module
+            elif scopenum == 1:  # package
+                key = (argname, param_index, item.fspath.dirpath())
+            elif scopenum == 2:  # module
                key = (argname, param_index, item.fspath)
-            elif scopenum == 2:  # class
+            elif scopenum == 3:  # class
                key = (argname, param_index, item.fspath, item.cls)
            yield key

@@ -274,11 +297,43 @@ def get_direct_param_fixture_func(request):
    return request.param


+@attr.s(slots=True)
 class FuncFixtureInfo(object):
-    def __init__(self, argnames, names_closure, name2fixturedefs):
-        self.argnames = argnames
-        self.names_closure = names_closure
-        self.name2fixturedefs = name2fixturedefs
+    # original function argument names
+    argnames = attr.ib(type=tuple)
+    # argnames that function immediately requires. These include argnames +
+    # fixture names specified via usefixtures and via autouse=True in fixture
+    # definitions.
+    initialnames = attr.ib(type=tuple)
+    names_closure = attr.ib(type="List[str]")
+    name2fixturedefs = attr.ib(type="List[str, List[FixtureDef]]")
+
+    def prune_dependency_tree(self):
+        """Recompute names_closure from initialnames and name2fixturedefs
+
+        Can only reduce names_closure, which means that the new closure will
+        always be a subset of the old one. The order is preserved.
+
+        This method is needed because direct parametrization may shadow some
+        of the fixtures that were included in the originally built dependency
+        tree. In this way the dependency tree can get pruned, and the closure
+        of argnames may get reduced.
+        """
+        closure = set()
+        working_set = set(self.initialnames)
+        while working_set:
+            argname = working_set.pop()
+            # argname may be smth not included in the original names_closure,
+            # in which case we ignore it. This currently happens with pseudo
+            # FixtureDefs which wrap 'get_direct_param_fixture_func(request)'.
+            # So they introduce the new dependency 'request' which might have
+            # been missing in the original tree (closure).
+            if argname not in closure and argname in self.names_closure:
+                closure.add(argname)
+                if argname in self.name2fixturedefs:
+                    working_set.update(self.name2fixturedefs[argname][-1].argnames)
+
+        self.names_closure[:] = sorted(closure, key=self.names_closure.index)


 class FixtureRequest(FuncargnamesCompatAttr):
@@ -580,7 +635,10 @@ class FixtureRequest(FuncargnamesCompatAttr):
        if scope == "function":
            # this might also be a non-function Item despite its attribute name
            return self._pyfuncitem
-        node = get_scope_node(self._pyfuncitem, scope)
+        if scope == "package":
+            node = get_scope_package(self._pyfuncitem, self._fixturedef)
+        else:
+            node = get_scope_node(self._pyfuncitem, scope)
        if node is None and scope == "class":
            # fallback to function item itself
            node = self._pyfuncitem
@@ -624,7 +682,7 @@ class ScopeMismatchError(Exception):
    """


-scopes = "session module class function".split()
+scopes = "session package module class function".split()
 scopenum_function = scopes.index("function")


@@ -734,23 +792,26 @@ def call_fixture_func(fixturefunc, request, kwargs):
    if yieldctx:
        it = fixturefunc(**kwargs)
        res = next(it)
-
-        def teardown():
-            try:
-                next(it)
-            except StopIteration:
-                pass
-            else:
-                fail_fixturefunc(
-                    fixturefunc, "yield_fixture function has more than one 'yield'"
-                )
-
-        request.addfinalizer(teardown)
+        finalizer = functools.partial(_teardown_yield_fixture, fixturefunc, it)
+        request.addfinalizer(finalizer)
    else:
        res = fixturefunc(**kwargs)
    return res


+def _teardown_yield_fixture(fixturefunc, it):
+    """Executes the teardown of a fixture function by advancing the iterator after the
+    yield and ensure the iteration ends (if not it means there is more than one yield in the function)"""
+    try:
+        next(it)
+    except StopIteration:
+        pass
+    else:
+        fail_fixturefunc(
+            fixturefunc, "yield_fixture function has more than one 'yield'"
+        )
+
+
 class FixtureDef(object):
    """ A container for a factory definition. """

@@ -841,15 +902,10 @@ class FixtureDef(object):
        )


-def pytest_fixture_setup(fixturedef, request):
-    """ Execution of fixture setup. """
-    kwargs = {}
-    for argname in fixturedef.argnames:
-        fixdef = request._get_active_fixturedef(argname)
-        result, arg_cache_key, exc = fixdef.cached_result
-        request._check_scope(argname, request.scope, fixdef.scope)
-        kwargs[argname] = result
-
+def resolve_fixture_function(fixturedef, request):
+    """Gets the actual callable that can be called to obtain the fixture value, dealing with unittest-specific
+    instances and bound methods.
+    """
    fixturefunc = fixturedef.func
    if fixturedef.unittest:
        if request.instance is not None:
@@ -863,6 +919,26 @@ def pytest_fixture_setup(fixturedef, request):
            fixturefunc = getimfunc(fixturedef.func)
            if fixturefunc != fixturedef.func:
                fixturefunc = fixturefunc.__get__(request.instance)
+    return fixturefunc
+
+
+def pytest_fixture_setup(fixturedef, request):
+    """ Execution of fixture setup. """
+    kwargs = {}
+    for argname in fixturedef.argnames:
+        fixdef = request._get_active_fixturedef(argname)
+        result, arg_cache_key, exc = fixdef.cached_result
+        request._check_scope(argname, request.scope, fixdef.scope)
+        kwargs[argname] = result
+
+    # if function has been defined with @pytest.fixture, we want to
+    # pass the special __being_called_by_pytest parameter so we don't raise a warning
+    # this is an ugly hack, see #3720 for an opportunity to improve this
+    defined_using_fixture_decorator = hasattr(fixturedef.func, "_pytestfixturefunction")
+    if defined_using_fixture_decorator:
+        kwargs["__being_called_by_pytest"] = True
+
+    fixturefunc = resolve_fixture_function(fixturedef, request)
    my_cache_key = request.param_index
    try:
        result = call_fixture_func(fixturefunc, request, kwargs)
@@ -881,6 +957,44 @@ def _ensure_immutable_ids(ids):
    return tuple(ids)


+def wrap_function_to_warning_if_called_directly(function, fixture_marker):
+    """Wrap the given fixture function so we can issue warnings about it being called directly, instead of
+    used as an argument in a test function.
+
+    The warning is emitted only in Python 3, because I didn't find a reliable way to make the wrapper function
+    keep the original signature, and we probably will drop Python 2 in Pytest 4 anyway.
+    """
+    is_yield_function = is_generator(function)
+    msg = FIXTURE_FUNCTION_CALL.format(name=fixture_marker.name or function.__name__)
+    warning = RemovedInPytest4Warning(msg)
+
+    if is_yield_function:
+
+        @functools.wraps(function)
+        def result(*args, **kwargs):
+            __tracebackhide__ = True
+            __being_called_by_pytest = kwargs.pop("__being_called_by_pytest", False)
+            if not __being_called_by_pytest:
+                warnings.warn(warning, stacklevel=3)
+            for x in function(*args, **kwargs):
+                yield x
+
+    else:
+
+        @functools.wraps(function)
+        def result(*args, **kwargs):
+            __tracebackhide__ = True
+            __being_called_by_pytest = kwargs.pop("__being_called_by_pytest", False)
+            if not __being_called_by_pytest:
+                warnings.warn(warning, stacklevel=3)
+            return function(*args, **kwargs)
+
+    if six.PY2:
+        result.__wrapped__ = function
+
+    return result
+
+
@attr.s(frozen=True)
 class FixtureFunctionMarker(object):
    scope = attr.ib()
@@ -898,6 +1012,8 @@ class FixtureFunctionMarker(object):
                "fixture is being applied more than once to the same function"
            )

+        function = wrap_function_to_warning_if_called_directly(function, self)
+
        function._pytestfixturefunction = self
        return function

@@ -905,16 +1021,27 @@ class FixtureFunctionMarker(object):
 def fixture(scope="function", params=None, autouse=False, ids=None, name=None):
    """Decorator to mark a fixture factory function.

-    This decorator can be used (with or without parameters) to define a
-    fixture function.  The name of the fixture function can later be
-    referenced to cause its invocation ahead of running tests: test
-    modules or classes can use the pytest.mark.usefixtures(fixturename)
-    marker.  Test functions can directly use fixture names as input
+    This decorator can be used, with or without parameters, to define a
+    fixture function.
+
+    The name of the fixture function can later be referenced to cause its
+    invocation ahead of running tests: test
+    modules or classes can use the ``pytest.mark.usefixtures(fixturename)``
+    marker.
+
+    Test functions can directly use fixture names as input
    arguments in which case the fixture instance returned from the fixture
    function will be injected.

+    Fixtures can provide their values to test functions using ``return`` or ``yield``
+    statements. When using ``yield`` the code block after the ``yield`` statement is executed
+    as teardown code regardless of the test outcome, and must yield exactly once.
+
    :arg scope: the scope for which this fixture is shared, one of
-                "function" (default), "class", "module" or "session".
+                ``"function"`` (default), ``"class"``, ``"module"``,
+                ``"package"`` or ``"session"``.
+
+                ``"package"`` is considered **experimental** at this time.

    :arg params: an optional list of parameters which will cause multiple
                invocations of the fixture function and all of the tests
@@ -935,10 +1062,6 @@ def fixture(scope="function", params=None, autouse=False, ids=None, name=None):
                to resolve this is to name the decorated function
                ``fixture_<fixturename>`` and then use
                ``@pytest.fixture(name='<fixturename>')``.
-
-    Fixtures can optionally provide their values to test functions using a ``yield`` statement,
-    instead of ``return``. In this case, the code block after the ``yield`` statement is executed
-    as teardown code regardless of the test outcome. A fixture function must yield exactly once.
    """
    if callable(scope) and params is None and autouse is False:
        # direct decoration
@@ -954,13 +1077,7 @@ def yield_fixture(scope="function", params=None, autouse=False, ids=None, name=N
    .. deprecated:: 3.0
        Use :py:func:`pytest.fixture` directly instead.
    """
-    if callable(scope) and params is None and not autouse:
-        # direct decoration
-        return FixtureFunctionMarker("function", params, autouse, ids=ids, name=name)(
-            scope
-        )
-    else:
-        return FixtureFunctionMarker(scope, params, autouse, ids=ids, name=name)
+    return fixture(scope=scope, params=params, autouse=autouse, ids=ids, name=name)


 defaultfuncargprefixmarker = fixture()
@@ -1033,11 +1150,12 @@ class FixtureManager(object):
        usefixtures = flatten(
            mark.args for mark in node.iter_markers(name="usefixtures")
        )
-        initialnames = argnames
-        initialnames = tuple(usefixtures) + initialnames
+        initialnames = tuple(usefixtures) + argnames
        fm = node.session._fixturemanager
-        names_closure, arg2fixturedefs = fm.getfixtureclosure(initialnames, node)
-        return FuncFixtureInfo(argnames, names_closure, arg2fixturedefs)
+        initialnames, names_closure, arg2fixturedefs = fm.getfixtureclosure(
+            initialnames, node
+        )
+        return FuncFixtureInfo(argnames, initialnames, names_closure, arg2fixturedefs)

    def pytest_plugin_registered(self, plugin):
        nodeid = None
@@ -1085,6 +1203,12 @@ class FixtureManager(object):
                    fixturenames_closure.append(arg)

        merge(fixturenames)
+
+        # at this point, fixturenames_closure contains what we call "initialnames",
+        # which is a set of fixturenames the function immediately requests. We
+        # need to return it as well, so save this.
+        initialnames = tuple(fixturenames_closure)
+
        arg2fixturedefs = {}
        lastlen = -1
        while lastlen != len(fixturenames_closure):
@@ -1106,7 +1230,7 @@ class FixtureManager(object):
                return fixturedefs[-1].scopenum

        fixturenames_closure.sort(key=sort_by_scope)
-        return fixturenames_closure, arg2fixturedefs
+        return initialnames, fixturenames_closure, arg2fixturedefs

    def pytest_generate_tests(self, metafunc):
        for argname in metafunc.fixturenames:
--- a/src/_pytest/hookspec.py
+++ b/src/_pytest/hookspec.py
@@ -1,6 +1,8 @@
 """ hook specifications for pytest plugins, invoked from main.py and builtin plugins.  """

 from pluggy import HookspecMarker
+from .deprecated import PYTEST_NAMESPACE
+

 hookspec = HookspecMarker("pytest")

@@ -22,10 +24,9 @@ def pytest_addhooks(pluginmanager):
    """


-@hookspec(historic=True)
+@hookspec(historic=True, warn_on_impl=PYTEST_NAMESPACE)
 def pytest_namespace():
    """
-    (**Deprecated**) this hook causes direct monkeypatching on pytest, its use is strongly discouraged
    return dict of name->object to be made globally available in
    the pytest namespace.

@@ -33,6 +34,19 @@ def pytest_namespace():

    .. note::
        This hook is incompatible with ``hookwrapper=True``.
+
+    .. warning::
+        This hook has been **deprecated** and will be removed in pytest 4.0.
+
+        Plugins whose users depend on the current namespace functionality should prepare to migrate to a
+        namespace they actually own.
+
+        To support the migration its suggested to trigger ``DeprecationWarnings`` for objects they put into the
+        pytest namespace.
+
+        An stopgap measure to avoid the warning is to monkeypatch the ``pytest`` module, but just as the
+        ``pytest_namespace`` hook this should be seen as a temporary measure to be removed in future versions after
+        an appropriate transition period.
    """


--- a/src/_pytest/logging.py
+++ b/src/_pytest/logging.py
@@ -270,6 +270,22 @@ class LogCaptureFixture(object):
        """
        return [(r.name, r.levelno, r.getMessage()) for r in self.records]

+    @property
+    def messages(self):
+        """Returns a list of format-interpolated log messages.
+
+        Unlike 'records', which contains the format string and parameters for interpolation, log messages in this list
+        are all interpolated.
+        Unlike 'text', which contains the output from the handler, log messages in this list are unadorned with
+        levels, timestamps, etc, making exact comparisions more reliable.
+
+        Note that traceback or stack info (from :func:`logging.exception` or the `exc_info` or `stack_info` arguments
+        to the logging functions) is not included, as this is added by the formatter in the handler.
+
+        .. versionadded:: 3.7
+        """
+        return [r.getMessage() for r in self.records]
+
    def clear(self):
        """Reset the list of log records and the captured log text."""
        self.handler.reset()
--- a/src/_pytest/main.py
+++ b/src/_pytest/main.py
@@ -383,6 +383,8 @@ class Session(nodes.FSCollector):
        self.trace = config.trace.root.get("collection")
        self._norecursepatterns = config.getini("norecursedirs")
        self.startdir = py.path.local()
+        # Keep track of any collected nodes in here, so we don't duplicate fixtures
+        self._node_cache = {}

        self.config.pluginmanager.register(self, name="session")

@@ -481,18 +483,61 @@ class Session(nodes.FSCollector):

    def _collect(self, arg):
        names = self._parsearg(arg)
-        path = names.pop(0)
-        if path.check(dir=1):
+        argpath = names.pop(0)
+        paths = []
+
+        root = self
+        # Start with a Session root, and delve to argpath item (dir or file)
+        # and stack all Packages found on the way.
+        # No point in finding packages when collecting doctests
+        if not self.config.option.doctestmodules:
+            for parent in argpath.parts():
+                pm = self.config.pluginmanager
+                if pm._confcutdir and pm._confcutdir.relto(parent):
+                    continue
+
+                if parent.isdir():
+                    pkginit = parent.join("__init__.py")
+                    if pkginit.isfile():
+                        if pkginit in self._node_cache:
+                            root = self._node_cache[pkginit]
+                        else:
+                            col = root._collectfile(pkginit)
+                            if col:
+                                root = col[0]
+                                self._node_cache[root.fspath] = root
+
+        # If it's a directory argument, recurse and look for any Subpackages.
+        # Let the Package collector deal with subnodes, don't collect here.
+        if argpath.check(dir=1):
            assert not names, "invalid arg %r" % (arg,)
-            for path in path.visit(
+            for path in argpath.visit(
                fil=lambda x: x.check(file=1), rec=self._recurse, bf=True, sort=True
            ):
-                for x in self._collectfile(path):
-                    yield x
+                pkginit = path.dirpath().join("__init__.py")
+                if pkginit.exists() and not any(x in pkginit.parts() for x in paths):
+                    for x in root._collectfile(pkginit):
+                        yield x
+                        paths.append(x.fspath.dirpath())
+
+                if not any(x in path.parts() for x in paths):
+                    for x in root._collectfile(path):
+                        if (type(x), x.fspath) in self._node_cache:
+                            yield self._node_cache[(type(x), x.fspath)]
+                        else:
+                            yield x
+                            self._node_cache[(type(x), x.fspath)] = x
        else:
-            assert path.check(file=1)
-            for x in self.matchnodes(self._collectfile(path), names):
-                yield x
+            assert argpath.check(file=1)
+
+            if argpath in self._node_cache:
+                col = self._node_cache[argpath]
+            else:
+                col = root._collectfile(argpath)
+                if col:
+                    self._node_cache[argpath] = col
+            for y in self.matchnodes(col, names):
+                yield y

    def _collectfile(self, path):
        ihook = self.gethookproxy(path)
@@ -577,7 +622,11 @@ class Session(nodes.FSCollector):
                    resultnodes.append(node)
                continue
            assert isinstance(node, nodes.Collector)
-            rep = collect_one_node(node)
+            if node.nodeid in self._node_cache:
+                rep = self._node_cache[node.nodeid]
+            else:
+                rep = collect_one_node(node)
+                self._node_cache[node.nodeid] = rep
            if rep.passed:
                has_matched = False
                for x in rep.result:
--- a/src/_pytest/nodes.py
+++ b/src/_pytest/nodes.py
@@ -173,10 +173,13 @@ class Node(object):
        chain.reverse()
        return chain

-    def add_marker(self, marker):
+    def add_marker(self, marker, append=True):
        """dynamically add a marker object to the node.

-        :type marker: str or pytest.mark.*
+        :type marker: ``str`` or ``pytest.mark.*``  object
+        :param marker:
+            ``append=True`` whether to append the marker,
+            if ``False`` insert at position ``0``.
        """
        from _pytest.mark import MarkDecorator, MARK_GEN

@@ -185,7 +188,10 @@ class Node(object):
        elif not isinstance(marker, MarkDecorator):
            raise ValueError("is not a string or pytest.mark.* Marker")
        self.keywords[marker.name] = marker
-        self.own_markers.append(marker.mark)
+        if append:
+            self.own_markers.append(marker.mark)
+        else:
+            self.own_markers.insert(0, marker.mark)

    def iter_markers(self, name=None):
        """
@@ -281,6 +287,11 @@ class Node(object):
            else:
                style = "long"

+        if self.config.option.verbose > 1:
+            truncate_locals = False
+        else:
+            truncate_locals = True
+
        try:
            os.getcwd()
            abspath = False
@@ -293,6 +304,7 @@ class Node(object):
            showlocals=self.config.option.showlocals,
            style=style,
            tbfilter=tbfilter,
+            truncate_locals=truncate_locals,
        )

    repr_failure = _repr_failure_py
@@ -352,7 +364,7 @@ class FSCollector(Collector):

            if not nodeid:
                nodeid = _check_initialpaths_for_relpath(session, fspath)
-            if os.sep != SEP:
+            if nodeid and os.sep != SEP:
                nodeid = nodeid.replace(os.sep, SEP)

        super(FSCollector, self).__init__(
--- a/src/_pytest/paths.py
+++ b/src/_pytest/paths.py
@@ -0,0 +1,13 @@
+from .compat import Path
+from os.path import expanduser, expandvars, isabs
+
+
+def resolve_from_str(input, root):
+    assert not isinstance(input, Path), "would break on py2"
+    root = Path(root)
+    input = expanduser(input)
+    input = expandvars(input)
+    if isabs(input):
+        return Path(input)
+    else:
+        return root.joinpath(input)
--- a/src/_pytest/pytester.py
+++ b/src/_pytest/pytester.py
@@ -21,7 +21,7 @@ import py
 import pytest
 from _pytest.main import Session, EXIT_OK
 from _pytest.assertion.rewrite import AssertionRewritingHook
-
+from _pytest.compat import Path

 IGNORE_PAM = [  # filenames added when obtaining details about the current user
    u"/var/lib/sss/mc/passwd"
@@ -48,6 +48,10 @@ def pytest_addoption(parser):
        ),
    )

+    parser.addini(
+        "pytester_example_dir", help="directory to take the pytester example files from"
+    )
+

 def pytest_configure(config):
    if config.getvalue("lsof"):
@@ -623,6 +627,48 @@ class Testdir(object):
        p.ensure("__init__.py")
        return p

+    def copy_example(self, name=None):
+        from . import experiments
+        import warnings
+
+        warnings.warn(experiments.PYTESTER_COPY_EXAMPLE, stacklevel=2)
+        example_dir = self.request.config.getini("pytester_example_dir")
+        if example_dir is None:
+            raise ValueError("pytester_example_dir is unset, can't copy examples")
+        example_dir = self.request.config.rootdir.join(example_dir)
+
+        for extra_element in self.request.node.iter_markers("pytester_example_path"):
+            assert extra_element.args
+            example_dir = example_dir.join(*extra_element.args)
+
+        if name is None:
+            func_name = self.request.function.__name__
+            maybe_dir = example_dir / func_name
+            maybe_file = example_dir / (func_name + ".py")
+
+            if maybe_dir.isdir():
+                example_path = maybe_dir
+            elif maybe_file.isfile():
+                example_path = maybe_file
+            else:
+                raise LookupError(
+                    "{} cant be found as module or package in {}".format(
+                        func_name, example_dir.bestrelpath(self.request.confg.rootdir)
+                    )
+                )
+        else:
+            example_path = example_dir.join(name)
+
+        if example_path.isdir() and not example_path.join("__init__.py").isfile():
+            example_path.copy(self.tmpdir)
+            return self.tmpdir
+        elif example_path.isfile():
+            result = self.tmpdir.join(example_path.basename)
+            example_path.copy(result)
+            return result
+        else:
+            raise LookupError("example is not found as a file or directory")
+
    Session = Session

    def getnode(self, config, arg):
@@ -929,14 +975,16 @@ class Testdir(object):
            same directory to ensure it is a package

        """
-        kw = {self.request.function.__name__: Source(source).strip()}
-        path = self.makepyfile(**kw)
+        if isinstance(source, Path):
+            path = self.tmpdir.join(str(source))
+            assert not withinit, "not supported for paths"
+        else:
+            kw = {self.request.function.__name__: Source(source).strip()}
+            path = self.makepyfile(**kw)
        if withinit:
            self.makepyfile(__init__="#")
        self.config = config = self.parseconfigure(path, *configargs)
-        node = self.getnode(config, path)
-
-        return node
+        return self.getnode(config, path)

    def collect_by_name(self, modcol, name):
        """Return the collection node for name from the module collection.
--- a/src/_pytest/python.py
+++ b/src/_pytest/python.py
@@ -12,6 +12,7 @@ from textwrap import dedent

 import py
 import six
+from _pytest.main import FSHookProxy
 from _pytest.mark import MarkerError
 from _pytest.config import hookimpl

@@ -200,7 +201,7 @@ def pytest_collect_file(path, parent):
    ext = path.ext
    if ext == ".py":
        if not parent.session.isinitpath(path):
-            for pat in parent.config.getini("python_files"):
+            for pat in parent.config.getini("python_files") + ["__init__.py"]:
                if path.fnmatch(pat):
                    break
            else:
@@ -210,9 +211,23 @@ def pytest_collect_file(path, parent):


 def pytest_pycollect_makemodule(path, parent):
+    if path.basename == "__init__.py":
+        return Package(path, parent)
    return Module(path, parent)


+def pytest_ignore_collect(path, config):
+    # Skip duplicate packages.
+    keepduplicates = config.getoption("keepduplicates")
+    if keepduplicates:
+        duplicate_paths = config.pluginmanager._duplicatepaths
+        if path.basename == "__init__.py":
+            if path in duplicate_paths:
+                return True
+            else:
+                duplicate_paths.add(path)
+
+
@hookimpl(hookwrapper=True)
 def pytest_pycollect_makeitem(collector, name, obj):
    outcome = yield
@@ -438,6 +453,11 @@ class PyCollector(PyobjMixin, nodes.Collector):
            # add funcargs() as fixturedefs to fixtureinfo.arg2fixturedefs
            fixtures.add_funcarg_pseudo_fixture_def(self, metafunc, fm)

+            # add_funcarg_pseudo_fixture_def may have shadowed some fixtures
+            # with direct parametrization, so make sure we update what the
+            # function really needs.
+            fixtureinfo.prune_dependency_tree()
+
            for callspec in metafunc._calls:
                subname = "%s[%s]" % (name, callspec.id)
                yield Function(
@@ -525,6 +545,66 @@ class Module(nodes.File, PyCollector):
            self.addfinalizer(teardown_module)


+class Package(Module):
+    def __init__(self, fspath, parent=None, config=None, session=None, nodeid=None):
+        session = parent.session
+        nodes.FSCollector.__init__(
+            self, fspath, parent=parent, config=config, session=session, nodeid=nodeid
+        )
+        self.name = fspath.dirname
+        self.trace = session.trace
+        self._norecursepatterns = session._norecursepatterns
+        for path in list(session.config.pluginmanager._duplicatepaths):
+            if path.dirname == fspath.dirname and path != fspath:
+                session.config.pluginmanager._duplicatepaths.remove(path)
+
+    def _recurse(self, path):
+        ihook = self.gethookproxy(path.dirpath())
+        if ihook.pytest_ignore_collect(path=path, config=self.config):
+            return
+        for pat in self._norecursepatterns:
+            if path.check(fnmatch=pat):
+                return False
+        ihook = self.gethookproxy(path)
+        ihook.pytest_collect_directory(path=path, parent=self)
+        return True
+
+    def gethookproxy(self, fspath):
+        # check if we have the common case of running
+        # hooks with all conftest.py filesall conftest.py
+        pm = self.config.pluginmanager
+        my_conftestmodules = pm._getconftestmodules(fspath)
+        remove_mods = pm._conftest_plugins.difference(my_conftestmodules)
+        if remove_mods:
+            # one or more conftests are not in use at this fspath
+            proxy = FSHookProxy(fspath, pm, remove_mods)
+        else:
+            # all plugis are active for this fspath
+            proxy = self.config.hook
+        return proxy
+
+    def _collectfile(self, path):
+        ihook = self.gethookproxy(path)
+        if not self.isinitpath(path):
+            if ihook.pytest_ignore_collect(path=path, config=self.config):
+                return ()
+        return ihook.pytest_collect_file(path=path, parent=self)
+
+    def isinitpath(self, path):
+        return path in self.session._initialpaths
+
+    def collect(self):
+        path = self.fspath.dirpath()
+        pkg_prefix = None
+        for path in path.visit(fil=lambda x: 1, rec=self._recurse, bf=True, sort=True):
+            if pkg_prefix and pkg_prefix in path.parts():
+                continue
+            for x in self._collectfile(path):
+                yield x
+                if isinstance(x, Package):
+                    pkg_prefix = path.dirpath()
+
+
 def _get_xunit_setup_teardown(holder, attr_name, param_obj=None):
    """
    Return a callable to perform xunit-style setup or teardown if
--- a/src/_pytest/python_api.py
+++ b/src/_pytest/python_api.py
@@ -211,7 +211,7 @@ class ApproxScalar(ApproxBase):
        the pre-specified tolerance.
        """
        if _is_numpy_array(actual):
-            return ApproxNumpy(actual, self.abs, self.rel, self.nan_ok) == self.expected
+            return all(a == self for a in actual.flat)

        # Short-circuit exact equality.
        if actual == self.expected:
--- a/src/_pytest/reports.py
+++ b/src/_pytest/reports.py
@@ -0,0 +1,196 @@
+import py
+from _pytest._code.code import TerminalRepr
+
+
+def getslaveinfoline(node):
+    try:
+        return node._slaveinfocache
+    except AttributeError:
+        d = node.slaveinfo
+        ver = "%s.%s.%s" % d["version_info"][:3]
+        node._slaveinfocache = s = "[%s] %s -- Python %s %s" % (
+            d["id"],
+            d["sysplatform"],
+            ver,
+            d["executable"],
+        )
+        return s
+
+
+class BaseReport(object):
+    def __init__(self, **kw):
+        self.__dict__.update(kw)
+
+    def toterminal(self, out):
+        if hasattr(self, "node"):
+            out.line(getslaveinfoline(self.node))
+
+        longrepr = self.longrepr
+        if longrepr is None:
+            return
+
+        if hasattr(longrepr, "toterminal"):
+            longrepr.toterminal(out)
+        else:
+            try:
+                out.line(longrepr)
+            except UnicodeEncodeError:
+                out.line("<unprintable longrepr>")
+
+    def get_sections(self, prefix):
+        for name, content in self.sections:
+            if name.startswith(prefix):
+                yield prefix, content
+
+    @property
+    def longreprtext(self):
+        """
+        Read-only property that returns the full string representation
+        of ``longrepr``.
+
+        .. versionadded:: 3.0
+        """
+        tw = py.io.TerminalWriter(stringio=True)
+        tw.hasmarkup = False
+        self.toterminal(tw)
+        exc = tw.stringio.getvalue()
+        return exc.strip()
+
+    @property
+    def caplog(self):
+        """Return captured log lines, if log capturing is enabled
+
+        .. versionadded:: 3.5
+        """
+        return "\n".join(
+            content for (prefix, content) in self.get_sections("Captured log")
+        )
+
+    @property
+    def capstdout(self):
+        """Return captured text from stdout, if capturing is enabled
+
+        .. versionadded:: 3.0
+        """
+        return "".join(
+            content for (prefix, content) in self.get_sections("Captured stdout")
+        )
+
+    @property
+    def capstderr(self):
+        """Return captured text from stderr, if capturing is enabled
+
+        .. versionadded:: 3.0
+        """
+        return "".join(
+            content for (prefix, content) in self.get_sections("Captured stderr")
+        )
+
+    passed = property(lambda x: x.outcome == "passed")
+    failed = property(lambda x: x.outcome == "failed")
+    skipped = property(lambda x: x.outcome == "skipped")
+
+    @property
+    def fspath(self):
+        return self.nodeid.split("::")[0]
+
+
+class TestReport(BaseReport):
+    """ Basic test report object (also used for setup and teardown calls if
+    they fail).
+    """
+
+    def __init__(
+        self,
+        nodeid,
+        location,
+        keywords,
+        outcome,
+        longrepr,
+        when,
+        sections=(),
+        duration=0,
+        user_properties=(),
+        **extra
+    ):
+        #: normalized collection node id
+        self.nodeid = nodeid
+
+        #: a (filesystempath, lineno, domaininfo) tuple indicating the
+        #: actual location of a test item - it might be different from the
+        #: collected one e.g. if a method is inherited from a different module.
+        self.location = location
+
+        #: a name -> value dictionary containing all keywords and
+        #: markers associated with a test invocation.
+        self.keywords = keywords
+
+        #: test outcome, always one of "passed", "failed", "skipped".
+        self.outcome = outcome
+
+        #: None or a failure representation.
+        self.longrepr = longrepr
+
+        #: one of 'setup', 'call', 'teardown' to indicate runtest phase.
+        self.when = when
+
+        #: user properties is a list of tuples (name, value) that holds user
+        #: defined properties of the test
+        self.user_properties = user_properties
+
+        #: list of pairs ``(str, str)`` of extra information which needs to
+        #: marshallable. Used by pytest to add captured text
+        #: from ``stdout`` and ``stderr``, but may be used by other plugins
+        #: to add arbitrary information to reports.
+        self.sections = list(sections)
+
+        #: time it took to run just the test
+        self.duration = duration
+
+        self.__dict__.update(extra)
+
+    def __repr__(self):
+        return "<TestReport %r when=%r outcome=%r>" % (
+            self.nodeid,
+            self.when,
+            self.outcome,
+        )
+
+
+class TeardownErrorReport(BaseReport):
+    outcome = "failed"
+    when = "teardown"
+
+    def __init__(self, longrepr, **extra):
+        self.longrepr = longrepr
+        self.sections = []
+        self.__dict__.update(extra)
+
+
+class CollectReport(BaseReport):
+    def __init__(self, nodeid, outcome, longrepr, result, sections=(), **extra):
+        self.nodeid = nodeid
+        self.outcome = outcome
+        self.longrepr = longrepr
+        self.result = result or []
+        self.sections = list(sections)
+        self.__dict__.update(extra)
+
+    @property
+    def location(self):
+        return (self.fspath, None, self.fspath)
+
+    def __repr__(self):
+        return "<CollectReport %r lenresult=%s outcome=%r>" % (
+            self.nodeid,
+            len(self.result),
+            self.outcome,
+        )
+
+
+class CollectErrorRepr(TerminalRepr):
+    def __init__(self, msg):
+        self.longrepr = msg
+
+    def toterminal(self, out):
+        out.line(self.longrepr, red=True)
--- a/src/_pytest/runner.py
+++ b/src/_pytest/runner.py
@@ -7,9 +7,11 @@ import sys
 from time import time

 import py
-from _pytest._code.code import TerminalRepr, ExceptionInfo
+from _pytest._code.code import ExceptionInfo
 from _pytest.outcomes import skip, Skipped, TEST_OUTCOME

+from .reports import TestReport, CollectReport, CollectErrorRepr
+
 #
 # pytest plugin hooks

@@ -215,99 +217,6 @@ class CallInfo(object):
        return "<CallInfo when=%r %s>" % (self.when, status)


-def getslaveinfoline(node):
-    try:
-        return node._slaveinfocache
-    except AttributeError:
-        d = node.slaveinfo
-        ver = "%s.%s.%s" % d["version_info"][:3]
-        node._slaveinfocache = s = "[%s] %s -- Python %s %s" % (
-            d["id"],
-            d["sysplatform"],
-            ver,
-            d["executable"],
-        )
-        return s
-
-
-class BaseReport(object):
-    def __init__(self, **kw):
-        self.__dict__.update(kw)
-
-    def toterminal(self, out):
-        if hasattr(self, "node"):
-            out.line(getslaveinfoline(self.node))
-
-        longrepr = self.longrepr
-        if longrepr is None:
-            return
-
-        if hasattr(longrepr, "toterminal"):
-            longrepr.toterminal(out)
-        else:
-            try:
-                out.line(longrepr)
-            except UnicodeEncodeError:
-                out.line("<unprintable longrepr>")
-
-    def get_sections(self, prefix):
-        for name, content in self.sections:
-            if name.startswith(prefix):
-                yield prefix, content
-
-    @property
-    def longreprtext(self):
-        """
-        Read-only property that returns the full string representation
-        of ``longrepr``.
-
-        .. versionadded:: 3.0
-        """
-        tw = py.io.TerminalWriter(stringio=True)
-        tw.hasmarkup = False
-        self.toterminal(tw)
-        exc = tw.stringio.getvalue()
-        return exc.strip()
-
-    @property
-    def caplog(self):
-        """Return captured log lines, if log capturing is enabled
-
-        .. versionadded:: 3.5
-        """
-        return "\n".join(
-            content for (prefix, content) in self.get_sections("Captured log")
-        )
-
-    @property
-    def capstdout(self):
-        """Return captured text from stdout, if capturing is enabled
-
-        .. versionadded:: 3.0
-        """
-        return "".join(
-            content for (prefix, content) in self.get_sections("Captured stdout")
-        )
-
-    @property
-    def capstderr(self):
-        """Return captured text from stderr, if capturing is enabled
-
-        .. versionadded:: 3.0
-        """
-        return "".join(
-            content for (prefix, content) in self.get_sections("Captured stderr")
-        )
-
-    passed = property(lambda x: x.outcome == "passed")
-    failed = property(lambda x: x.outcome == "failed")
-    skipped = property(lambda x: x.outcome == "skipped")
-
-    @property
-    def fspath(self):
-        return self.nodeid.split("::")[0]
-
-
 def pytest_runtest_makereport(item, call):
    when = call.when
    duration = call.stop - call.start
@@ -348,78 +257,6 @@ def pytest_runtest_makereport(item, call):
    )


-class TestReport(BaseReport):
-    """ Basic test report object (also used for setup and teardown calls if
-    they fail).
-    """
-
-    def __init__(
-        self,
-        nodeid,
-        location,
-        keywords,
-        outcome,
-        longrepr,
-        when,
-        sections=(),
-        duration=0,
-        user_properties=(),
-        **extra
-    ):
-        #: normalized collection node id
-        self.nodeid = nodeid
-
-        #: a (filesystempath, lineno, domaininfo) tuple indicating the
-        #: actual location of a test item - it might be different from the
-        #: collected one e.g. if a method is inherited from a different module.
-        self.location = location
-
-        #: a name -> value dictionary containing all keywords and
-        #: markers associated with a test invocation.
-        self.keywords = keywords
-
-        #: test outcome, always one of "passed", "failed", "skipped".
-        self.outcome = outcome
-
-        #: None or a failure representation.
-        self.longrepr = longrepr
-
-        #: one of 'setup', 'call', 'teardown' to indicate runtest phase.
-        self.when = when
-
-        #: user properties is a list of tuples (name, value) that holds user
-        #: defined properties of the test
-        self.user_properties = user_properties
-
-        #: list of pairs ``(str, str)`` of extra information which needs to
-        #: marshallable. Used by pytest to add captured text
-        #: from ``stdout`` and ``stderr``, but may be used by other plugins
-        #: to add arbitrary information to reports.
-        self.sections = list(sections)
-
-        #: time it took to run just the test
-        self.duration = duration
-
-        self.__dict__.update(extra)
-
-    def __repr__(self):
-        return "<TestReport %r when=%r outcome=%r>" % (
-            self.nodeid,
-            self.when,
-            self.outcome,
-        )
-
-
-class TeardownErrorReport(BaseReport):
-    outcome = "failed"
-    when = "teardown"
-
-    def __init__(self, longrepr, **extra):
-        self.longrepr = longrepr
-        self.sections = []
-        self.__dict__.update(extra)
-
-
 def pytest_make_collect_report(collector):
    call = CallInfo(lambda: list(collector.collect()), "collect")
    longrepr = None
@@ -446,35 +283,6 @@ def pytest_make_collect_report(collector):
    return rep


-class CollectReport(BaseReport):
-    def __init__(self, nodeid, outcome, longrepr, result, sections=(), **extra):
-        self.nodeid = nodeid
-        self.outcome = outcome
-        self.longrepr = longrepr
-        self.result = result or []
-        self.sections = list(sections)
-        self.__dict__.update(extra)
-
-    @property
-    def location(self):
-        return (self.fspath, None, self.fspath)
-
-    def __repr__(self):
-        return "<CollectReport %r lenresult=%s outcome=%r>" % (
-            self.nodeid,
-            len(self.result),
-            self.outcome,
-        )
-
-
-class CollectErrorRepr(TerminalRepr):
-    def __init__(self, msg):
-        self.longrepr = msg
-
-    def toterminal(self, out):
-        out.line(self.longrepr, red=True)
-
-
 class SetupState(object):
    """ shared state for setting up/tearing down test items or collectors. """

--- a/src/pytest.py
+++ b/src/pytest.py
@@ -18,7 +18,7 @@ from _pytest.mark import MARK_GEN as mark, param
 from _pytest.main import Session
 from _pytest.nodes import Item, Collector, File
 from _pytest.fixtures import fillfixtures as _fillfuncargs
-from _pytest.python import Module, Class, Instance, Function, Generator
+from _pytest.python import Package, Module, Class, Instance, Function, Generator

 from _pytest.python_api import approx, raises

@@ -50,6 +50,7 @@ __all__ = [
    "Item",
    "File",
    "Collector",
+    "Package",
    "Session",
    "Module",
    "Class",
--- a/testing/acceptance_test.py
+++ b/testing/acceptance_test.py
@@ -14,13 +14,7 @@ from _pytest.main import EXIT_NOTESTSCOLLECTED, EXIT_USAGEERROR

 class TestGeneralUsage(object):
    def test_config_error(self, testdir):
-        testdir.makeconftest(
-            """
-            def pytest_configure(config):
-                import pytest
-                raise pytest.UsageError("hello")
-        """
-        )
+        testdir.copy_example("conftest_usageerror/conftest.py")
        result = testdir.runpytest(testdir.tmpdir)
        assert result.ret != 0
        result.stderr.fnmatch_lines(["*ERROR: hello"])
@@ -170,18 +164,7 @@ class TestGeneralUsage(object):
        result.stdout.fnmatch_lines(["*1 skip*"])

    def test_issue88_initial_file_multinodes(self, testdir):
-        testdir.makeconftest(
-            """
-            import pytest
-            class MyFile(pytest.File):
-                def collect(self):
-                    return [MyItem("hello", parent=self)]
-            def pytest_collect_file(path, parent):
-                return MyFile(path, parent)
-            class MyItem(pytest.Item):
-                pass
-        """
-        )
+        testdir.copy_example("issue88_initial_file_multinodes")
        p = testdir.makepyfile("def test_hello(): pass")
        result = testdir.runpytest(p, "--collect-only")
        result.stdout.fnmatch_lines(["*MyFile*test_issue88*", "*Module*test_issue88*"])
--- a/testing/code/test_excinfo.py
+++ b/testing/code/test_excinfo.py
@@ -579,6 +579,18 @@ raise ValueError()
        assert reprlocals.lines[2] == "y          = 5"
        assert reprlocals.lines[3] == "z          = 7"

+    def test_repr_local_truncated(self):
+        loc = {"l": [i for i in range(10)]}
+        p = FormattedExcinfo(showlocals=True)
+        truncated_reprlocals = p.repr_locals(loc)
+        assert truncated_reprlocals.lines
+        assert truncated_reprlocals.lines[0] == "l          = [0, 1, 2, 3, 4, 5, ...]"
+
+        q = FormattedExcinfo(showlocals=True, truncate_locals=False)
+        full_reprlocals = q.repr_locals(loc)
+        assert full_reprlocals.lines
+        assert full_reprlocals.lines[0] == "l          = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]"
+
    def test_repr_tracebackentry_lines(self, importasmod):
        mod = importasmod(
            """
--- a/testing/deprecated_test.py
+++ b/testing/deprecated_test.py
@@ -1,4 +1,6 @@
 from __future__ import absolute_import, division, print_function
+
+
 import pytest


@@ -263,3 +265,15 @@ def test_pytest_plugins_in_non_top_level_conftest_deprecated_no_false_positives(
        str(PYTEST_PLUGINS_FROM_NON_TOP_LEVEL_CONFTEST).splitlines()[0]
        not in res.stderr.str()
    )
+
+
+# @pytest.mark.skipif(six.PY2, reason="We issue the warning in Python 3 only")
+def test_call_fixture_function_deprecated():
+    """Check if a warning is raised if a fixture function is called directly (#3661)"""
+
+    @pytest.fixture
+    def fix():
+        return 1
+
+    with pytest.deprecated_call():
+        assert fix() == 1
--- a/testing/example_scripts/README.rst
+++ b/testing/example_scripts/README.rst
@@ -0,0 +1,9 @@
+Example test scripts
+=====================
+
+
+The files in this folder are not direct tests, but rather example test suites that demonstrate certain issues/behaviours.
+
+In the future we will move part of the content of the acceptance tests here in order to have directly testable code instead of writing out things and then running them in nested pytest sessions/subprocesses.
+
+This will aid debugging and comprehension.
--- a/testing/example_scripts/conftest_usageerror/conftest.py
+++ b/testing/example_scripts/conftest_usageerror/conftest.py
@@ -0,0 +1,4 @@
+def pytest_configure(config):
+    import pytest
+
+    raise pytest.UsageError("hello")
--- a/testing/example_scripts/fixtures/fill_fixtures/test_conftest_funcargs_only_available_in_subdir/sub1/init.py
+++ b/testing/example_scripts/fixtures/fill_fixtures/test_conftest_funcargs_only_available_in_subdir/sub1/init.py
--- a/testing/example_scripts/fixtures/fill_fixtures/test_conftest_funcargs_only_available_in_subdir/sub1/conftest.py
+++ b/testing/example_scripts/fixtures/fill_fixtures/test_conftest_funcargs_only_available_in_subdir/sub1/conftest.py
@@ -0,0 +1,7 @@
+import pytest
+
+
+@pytest.fixture
+def arg1(request):
+    with pytest.raises(Exception):
+        request.getfixturevalue("arg2")
--- a/testing/example_scripts/fixtures/fill_fixtures/test_conftest_funcargs_only_available_in_subdir/sub1/test_in_sub1.py
+++ b/testing/example_scripts/fixtures/fill_fixtures/test_conftest_funcargs_only_available_in_subdir/sub1/test_in_sub1.py
@@ -0,0 +1,2 @@
+def test_1(arg1):
+    pass
--- a/testing/example_scripts/fixtures/fill_fixtures/test_conftest_funcargs_only_available_in_subdir/sub2/init.py
+++ b/testing/example_scripts/fixtures/fill_fixtures/test_conftest_funcargs_only_available_in_subdir/sub2/init.py
--- a/testing/example_scripts/fixtures/fill_fixtures/test_conftest_funcargs_only_available_in_subdir/sub2/conftest.py
+++ b/testing/example_scripts/fixtures/fill_fixtures/test_conftest_funcargs_only_available_in_subdir/sub2/conftest.py
@@ -0,0 +1,7 @@
+
+import pytest
+
+
+@pytest.fixture
+def arg2(request):
+    pytest.raises(Exception, "request.getfixturevalue('arg1')")
--- a/testing/example_scripts/fixtures/fill_fixtures/test_conftest_funcargs_only_available_in_subdir/sub2/test_in_sub2.py
+++ b/testing/example_scripts/fixtures/fill_fixtures/test_conftest_funcargs_only_available_in_subdir/sub2/test_in_sub2.py
@@ -0,0 +1,2 @@
+def test_2(arg2):
+    pass
--- a/testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_conftest_conftest/conftest.py
+++ b/testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_conftest_conftest/conftest.py
@@ -0,0 +1,6 @@
+import pytest
+
+
+@pytest.fixture
+def spam():
+    return "spam"
--- a/testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_conftest_conftest/pkg/init.py
+++ b/testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_conftest_conftest/pkg/init.py
--- a/testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_conftest_conftest/pkg/conftest.py
+++ b/testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_conftest_conftest/pkg/conftest.py
@@ -0,0 +1,6 @@
+import pytest
+
+
+@pytest.fixture
+def spam(spam):
+    return spam * 2
--- a/testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_conftest_conftest/pkg/test_spam.py
+++ b/testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_conftest_conftest/pkg/test_spam.py
@@ -0,0 +1,2 @@
+def test_spam(spam):
+    assert spam == "spamspam"
--- a/testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_conftest_module/conftest.py
+++ b/testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_conftest_module/conftest.py
@@ -0,0 +1,6 @@
+import pytest
+
+
+@pytest.fixture
+def spam():
+    return "spam"
--- a/testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_conftest_module/test_extend_fixture_conftest_module.py
+++ b/testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_conftest_module/test_extend_fixture_conftest_module.py
@@ -0,0 +1,10 @@
+import pytest
+
+
+@pytest.fixture
+def spam(spam):
+    return spam * 2
+
+
+def test_spam(spam):
+    assert spam == "spamspam"
--- a/testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_module_class.py
+++ b/testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_module_class.py
@@ -0,0 +1,15 @@
+import pytest
+
+
+@pytest.fixture
+def spam():
+    return "spam"
+
+
+class TestSpam(object):
+    @pytest.fixture
+    def spam(self, spam):
+        return spam * 2
+
+    def test_spam(self, spam):
+        assert spam == "spamspam"
--- a/testing/example_scripts/fixtures/fill_fixtures/test_funcarg_basic.py
+++ b/testing/example_scripts/fixtures/fill_fixtures/test_funcarg_basic.py
@@ -0,0 +1,16 @@
+
+import pytest
+
+
+@pytest.fixture
+def some(request):
+    return request.function.__name__
+
+
+@pytest.fixture
+def other(request):
+    return 42
+
+
+def test_func(some, other):
+    pass
--- a/testing/example_scripts/fixtures/fill_fixtures/test_funcarg_lookup_classlevel.py
+++ b/testing/example_scripts/fixtures/fill_fixtures/test_funcarg_lookup_classlevel.py
@@ -0,0 +1,11 @@
+
+import pytest
+
+
+class TestClass(object):
+    @pytest.fixture
+    def something(self, request):
+        return request.instance
+
+    def test_method(self, something):
+        assert something is self
--- a/testing/example_scripts/fixtures/fill_fixtures/test_funcarg_lookup_modulelevel.py
+++ b/testing/example_scripts/fixtures/fill_fixtures/test_funcarg_lookup_modulelevel.py
@@ -0,0 +1,15 @@
+import pytest
+
+
+@pytest.fixture
+def something(request):
+    return request.function.__name__
+
+
+class TestClass(object):
+    def test_method(self, something):
+        assert something == "test_method"
+
+
+def test_func(something):
+    assert something == "test_func"
--- a/testing/example_scripts/fixtures/fill_fixtures/test_funcarg_lookupfails.py
+++ b/testing/example_scripts/fixtures/fill_fixtures/test_funcarg_lookupfails.py
@@ -0,0 +1,10 @@
+import pytest
+
+
+@pytest.fixture
+def xyzsomething(request):
+    return 42
+
+
+def test_func(some):
+    pass
--- a/testing/example_scripts/issue88_initial_file_multinodes/conftest.py
+++ b/testing/example_scripts/issue88_initial_file_multinodes/conftest.py
@@ -0,0 +1,14 @@
+import pytest
+
+
+class MyFile(pytest.File):
+    def collect(self):
+        return [MyItem("hello", parent=self)]
+
+
+def pytest_collect_file(path, parent):
+    return MyFile(path, parent)
+
+
+class MyItem(pytest.Item):
+    pass
--- a/testing/example_scripts/issue88_initial_file_multinodes/test_hello.py
+++ b/testing/example_scripts/issue88_initial_file_multinodes/test_hello.py
@@ -0,0 +1,2 @@
+def test_hello():
+    pass
--- a/testing/example_scripts/issue_519.py
+++ b/testing/example_scripts/issue_519.py
@@ -0,0 +1,51 @@
+
+import pytest
+import pprint
+
+
+def pytest_generate_tests(metafunc):
+    if "arg1" in metafunc.fixturenames:
+        metafunc.parametrize("arg1", ["arg1v1", "arg1v2"], scope="module")
+
+    if "arg2" in metafunc.fixturenames:
+        metafunc.parametrize("arg2", ["arg2v1", "arg2v2"], scope="function")
+
+
+@pytest.fixture(scope="session")
+def checked_order():
+    order = []
+
+    yield order
+    pprint.pprint(order)
+    assert order == [
+        ("testing/example_scripts/issue_519.py", "fix1", "arg1v1"),
+        ("test_one[arg1v1-arg2v1]", "fix2", "arg2v1"),
+        ("test_two[arg1v1-arg2v1]", "fix2", "arg2v1"),
+        ("test_one[arg1v1-arg2v2]", "fix2", "arg2v2"),
+        ("test_two[arg1v1-arg2v2]", "fix2", "arg2v2"),
+        ("testing/example_scripts/issue_519.py", "fix1", "arg1v2"),
+        ("test_one[arg1v2-arg2v1]", "fix2", "arg2v1"),
+        ("test_two[arg1v2-arg2v1]", "fix2", "arg2v1"),
+        ("test_one[arg1v2-arg2v2]", "fix2", "arg2v2"),
+        ("test_two[arg1v2-arg2v2]", "fix2", "arg2v2"),
+    ]
+
+
+@pytest.yield_fixture(scope="module")
+def fix1(request, arg1, checked_order):
+    checked_order.append((request.node.name, "fix1", arg1))
+    yield "fix1-" + arg1
+
+
+@pytest.yield_fixture(scope="function")
+def fix2(request, fix1, arg2, checked_order):
+    checked_order.append((request.node.name, "fix2", arg2))
+    yield "fix2-" + arg2 + fix1
+
+
+def test_one(fix2):
+    pass
+
+
+def test_two(fix2):
+    pass
--- a/testing/example_scripts/tmpdir/tmpdir_fixture.py
+++ b/testing/example_scripts/tmpdir/tmpdir_fixture.py
@@ -0,0 +1,7 @@
+import pytest
+
+
+@pytest.mark.parametrize("a", [r"qwe/\abc"])
+def test_fixture(tmpdir, a):
+    tmpdir.check(dir=1)
+    assert tmpdir.listdir() == []
--- a/testing/examples/test_issue519.py
+++ b/testing/examples/test_issue519.py
@@ -0,0 +1,3 @@
+def test_510(testdir):
+    testdir.copy_example("issue_519.py")
+    testdir.runpytest("issue_519.py")
--- a/testing/logging/test_fixture.py
+++ b/testing/logging/test_fixture.py
@@ -73,6 +73,27 @@ def test_log_access(caplog):
    assert "boo arg" in caplog.text


+def test_messages(caplog):
+    caplog.set_level(logging.INFO)
+    logger.info("boo %s", "arg")
+    logger.info("bar %s\nbaz %s", "arg1", "arg2")
+    assert "boo arg" == caplog.messages[0]
+    assert "bar arg1\nbaz arg2" == caplog.messages[1]
+    assert caplog.text.count("\n") > len(caplog.messages)
+    assert len(caplog.text.splitlines()) > len(caplog.messages)
+
+    try:
+        raise Exception("test")
+    except Exception:
+        logger.exception("oops")
+
+    assert "oops" in caplog.text
+    assert "oops" in caplog.messages[-1]
+    # Tracebacks are stored in the record and not added until the formatter or handler.
+    assert "Exception" in caplog.text
+    assert "Exception" not in caplog.messages[-1]
+
+
 def test_record_tuples(caplog):
    caplog.set_level(logging.INFO)
    logger.info("boo %s", "arg")
--- a/testing/python/approx.py
+++ b/testing/python/approx.py
@@ -342,6 +342,68 @@ class TestApprox(object):
        assert actual == approx(list(expected), rel=5e-7, abs=0)
        assert actual != approx(list(expected), rel=5e-8, abs=0)

+    def test_numpy_tolerance_args(self):
+        """
+        Check that numpy rel/abs args are handled correctly
+        for comparison against an np.array
+        Check both sides of the operator, hopefully it doesn't impact things.
+        Test all permutations of where the approx and np.array() can show up
+        """
+        np = pytest.importorskip("numpy")
+        expected = 100.
+        actual = 99.
+        abs_diff = expected - actual
+        rel_diff = (expected - actual) / expected
+
+        tests = [
+            (eq, abs_diff, 0),
+            (eq, 0, rel_diff),
+            (ne, 0, rel_diff / 2.),  # rel diff fail
+            (ne, abs_diff / 2., 0),  # abs diff fail
+        ]
+
+        for op, _abs, _rel in tests:
+            assert op(np.array(actual), approx(expected, abs=_abs, rel=_rel))  # a, b
+            assert op(approx(expected, abs=_abs, rel=_rel), np.array(actual))  # b, a
+
+            assert op(actual, approx(np.array(expected), abs=_abs, rel=_rel))  # a, b
+            assert op(approx(np.array(expected), abs=_abs, rel=_rel), actual)  # b, a
+
+            assert op(np.array(actual), approx(np.array(expected), abs=_abs, rel=_rel))
+            assert op(approx(np.array(expected), abs=_abs, rel=_rel), np.array(actual))
+
+    def test_numpy_expecting_nan(self):
+        np = pytest.importorskip("numpy")
+        examples = [
+            (eq, nan, nan),
+            (eq, -nan, -nan),
+            (eq, nan, -nan),
+            (ne, 0.0, nan),
+            (ne, inf, nan),
+        ]
+        for op, a, x in examples:
+            # Nothing is equal to NaN by default.
+            assert np.array(a) != approx(x)
+            assert a != approx(np.array(x))
+
+            # If ``nan_ok=True``, then NaN is equal to NaN.
+            assert op(np.array(a), approx(x, nan_ok=True))
+            assert op(a, approx(np.array(x), nan_ok=True))
+
+    def test_numpy_expecting_inf(self):
+        np = pytest.importorskip("numpy")
+        examples = [
+            (eq, inf, inf),
+            (eq, -inf, -inf),
+            (ne, inf, -inf),
+            (ne, 0.0, inf),
+            (ne, nan, inf),
+        ]
+        for op, a, x in examples:
+            assert op(np.array(a), approx(x))
+            assert op(a, approx(np.array(x)))
+            assert op(np.array(a), approx(np.array(x)))
+
    def test_numpy_array_wrong_shape(self):
        np = pytest.importorskip("numpy")

--- a/testing/python/collect.py
+++ b/testing/python/collect.py
@@ -630,6 +630,37 @@ class TestFunction(object):
        rec = testdir.inline_run()
        rec.assertoutcome(passed=1)

+    def test_parametrize_overrides_indirect_dependency_fixture(self, testdir):
+        """Test parametrization when parameter overrides a fixture that a test indirectly depends on"""
+        testdir.makepyfile(
+            """
+            import pytest
+
+            fix3_instantiated = False
+
+            @pytest.fixture
+            def fix1(fix2):
+               return fix2 + '1'
+
+            @pytest.fixture
+            def fix2(fix3):
+               return fix3 + '2'
+
+            @pytest.fixture
+            def fix3():
+               global fix3_instantiated
+               fix3_instantiated = True
+               return '3'
+
+            @pytest.mark.parametrize('fix2', ['2'])
+            def test_it(fix1):
+               assert fix1 == '21'
+               assert not fix3_instantiated
+        """
+        )
+        rec = testdir.inline_run()
+        rec.assertoutcome(passed=1)
+
    @ignore_parametrized_marks
    def test_parametrize_with_mark(self, testdir):
        items = testdir.getitems(
@@ -1047,7 +1078,7 @@ def test_setup_only_available_in_subdir(testdir):


 def test_modulecol_roundtrip(testdir):
-    modcol = testdir.getmodulecol("pass", withinit=True)
+    modcol = testdir.getmodulecol("pass", withinit=False)
    trail = modcol.nodeid
    newcol = modcol.session.perform_collect([trail], genitems=0)[0]
    assert modcol.name == newcol.name
--- a/testing/python/fixture.py
+++ b/testing/python/fixture.py
@@ -5,6 +5,7 @@ import pytest
 from _pytest.pytester import get_public_names
 from _pytest.fixtures import FixtureLookupError, FixtureRequest
 from _pytest import fixtures
+from _pytest.compat import Path


 def test_getfuncargnames():
@@ -40,45 +41,27 @@ def test_getfuncargnames():
    assert fixtures.getfuncargnames(A.static, cls=A) == ("arg1", "arg2")


+@pytest.mark.pytester_example_path("fixtures/fill_fixtures")
 class TestFillFixtures(object):
    def test_fillfuncargs_exposed(self):
        # used by oejskit, kept for compatibility
        assert pytest._fillfuncargs == fixtures.fillfixtures

    def test_funcarg_lookupfails(self, testdir):
-        testdir.makepyfile(
-            """
-            import pytest
-
-            @pytest.fixture
-            def xyzsomething(request):
-                return 42
-
-            def test_func(some):
-                pass
-        """
-        )
+        testdir.copy_example()
        result = testdir.runpytest()  # "--collect-only")
        assert result.ret != 0
        result.stdout.fnmatch_lines(
-            ["*def test_func(some)*", "*fixture*some*not found*", "*xyzsomething*"]
+            """
+            *def test_func(some)*
+            *fixture*some*not found*
+            *xyzsomething*
+            """
        )

    def test_funcarg_basic(self, testdir):
-        item = testdir.getitem(
-            """
-            import pytest
-
-            @pytest.fixture
-            def some(request):
-                return request.function.__name__
-            @pytest.fixture
-            def other(request):
-                return 42
-            def test_func(some, other):
-                pass
-        """
-        )
+        testdir.copy_example()
+        item = testdir.getitem(Path("test_funcarg_basic.py"))
        fixtures.fillfixtures(item)
        del item.funcargs["request"]
        assert len(get_public_names(item.funcargs)) == 2
@@ -86,155 +69,39 @@ class TestFillFixtures(object):
        assert item.funcargs["other"] == 42

    def test_funcarg_lookup_modulelevel(self, testdir):
-        testdir.makepyfile(
-            """
-            import pytest
-
-            @pytest.fixture
-            def something(request):
-                return request.function.__name__
-
-            class TestClass(object):
-                def test_method(self, something):
-                    assert something == "test_method"
-            def test_func(something):
-                assert something == "test_func"
-        """
-        )
+        testdir.copy_example()
        reprec = testdir.inline_run()
        reprec.assertoutcome(passed=2)

    def test_funcarg_lookup_classlevel(self, testdir):
-        p = testdir.makepyfile(
-            """
-            import pytest
-            class TestClass(object):
-
-                @pytest.fixture
-                def something(self, request):
-                    return request.instance
-
-                def test_method(self, something):
-                    assert something is self
-        """
-        )
+        p = testdir.copy_example()
        result = testdir.runpytest(p)
        result.stdout.fnmatch_lines(["*1 passed*"])

    def test_conftest_funcargs_only_available_in_subdir(self, testdir):
-        sub1 = testdir.mkpydir("sub1")
-        sub2 = testdir.mkpydir("sub2")
-        sub1.join("conftest.py").write(
-            _pytest._code.Source(
-                """
-            import pytest
-            @pytest.fixture
-            def arg1(request):
-                pytest.raises(Exception, "request.getfixturevalue('arg2')")
-        """
-            )
-        )
-        sub2.join("conftest.py").write(
-            _pytest._code.Source(
-                """
-            import pytest
-            @pytest.fixture
-            def arg2(request):
-                pytest.raises(Exception, "request.getfixturevalue('arg1')")
-        """
-            )
-        )
-
-        sub1.join("test_in_sub1.py").write("def test_1(arg1): pass")
-        sub2.join("test_in_sub2.py").write("def test_2(arg2): pass")
+        testdir.copy_example()
        result = testdir.runpytest("-v")
        result.assert_outcomes(passed=2)

    def test_extend_fixture_module_class(self, testdir):
-        testfile = testdir.makepyfile(
-            """
-            import pytest
-
-            @pytest.fixture
-            def spam():
-                return 'spam'
-
-            class TestSpam(object):
-
-                 @pytest.fixture
-                 def spam(self, spam):
-                     return spam * 2
-
-                 def test_spam(self, spam):
-                     assert spam == 'spamspam'
-        """
-        )
+        testfile = testdir.copy_example()
        result = testdir.runpytest()
        result.stdout.fnmatch_lines(["*1 passed*"])
        result = testdir.runpytest(testfile)
        result.stdout.fnmatch_lines(["*1 passed*"])

    def test_extend_fixture_conftest_module(self, testdir):
-        testdir.makeconftest(
-            """
-            import pytest
-
-            @pytest.fixture
-            def spam():
-                return 'spam'
-        """
-        )
-        testfile = testdir.makepyfile(
-            """
-            import pytest
-
-            @pytest.fixture
-            def spam(spam):
-                return spam * 2
-
-            def test_spam(spam):
-                assert spam == 'spamspam'
-        """
-        )
+        p = testdir.copy_example()
        result = testdir.runpytest()
        result.stdout.fnmatch_lines(["*1 passed*"])
-        result = testdir.runpytest(testfile)
+        result = testdir.runpytest(next(p.visit("test_*.py")))
        result.stdout.fnmatch_lines(["*1 passed*"])

    def test_extend_fixture_conftest_conftest(self, testdir):
-        testdir.makeconftest(
-            """
-            import pytest
-
-            @pytest.fixture
-            def spam():
-                return 'spam'
-        """
-        )
-        pkg = testdir.mkpydir("pkg")
-        pkg.join("conftest.py").write(
-            _pytest._code.Source(
-                """
-            import pytest
-
-            @pytest.fixture
-            def spam(spam):
-                return spam * 2
-        """
-            )
-        )
-        testfile = pkg.join("test_spam.py")
-        testfile.write(
-            _pytest._code.Source(
-                """
-            def test_spam(spam):
-                assert spam == "spamspam"
-        """
-            )
-        )
+        p = testdir.copy_example()
        result = testdir.runpytest()
        result.stdout.fnmatch_lines(["*1 passed*"])
-        result = testdir.runpytest(testfile)
+        result = testdir.runpytest(next(p.visit("test_*.py")))
        result.stdout.fnmatch_lines(["*1 passed*"])

    def test_extend_fixture_conftest_plugin(self, testdir):
@@ -1589,6 +1456,7 @@ class TestFixtureManagerParseFactories(object):
        testdir.makepyfile(
            """
            import pytest
+            import six

            @pytest.fixture
            def hello(request):
@@ -1601,9 +1469,11 @@ class TestFixtureManagerParseFactories(object):
                    faclist = fm.getfixturedefs("hello", item.nodeid)
                    print (faclist)
                    assert len(faclist) == 3
-                    assert faclist[0].func(item._request) == "conftest"
-                    assert faclist[1].func(item._request) == "module"
-                    assert faclist[2].func(item._request) == "class"
+
+                    kwargs = {'__being_called_by_pytest': True}
+                    assert faclist[0].func(item._request, **kwargs) == "conftest"
+                    assert faclist[1].func(item._request, **kwargs) == "module"
+                    assert faclist[2].func(item._request, **kwargs) == "class"
        """
        )
        reprec = testdir.inline_run("-s")
@@ -1658,6 +1528,97 @@ class TestFixtureManagerParseFactories(object):
            reprec = testdir.inline_run("..")
            reprec.assertoutcome(passed=2)

+    def test_package_xunit_fixture(self, testdir):
+        testdir.makepyfile(
+            __init__="""\
+            values = []
+        """
+        )
+        package = testdir.mkdir("package")
+        package.join("__init__.py").write(
+            dedent(
+                """\
+            from .. import values
+            def setup_module():
+                values.append("package")
+            def teardown_module():
+                values[:] = []
+        """
+            )
+        )
+        package.join("test_x.py").write(
+            dedent(
+                """\
+            from .. import values
+            def test_x():
+                assert values == ["package"]
+        """
+            )
+        )
+        package = testdir.mkdir("package2")
+        package.join("__init__.py").write(
+            dedent(
+                """\
+            from .. import values
+            def setup_module():
+                values.append("package2")
+            def teardown_module():
+                values[:] = []
+        """
+            )
+        )
+        package.join("test_x.py").write(
+            dedent(
+                """\
+            from .. import values
+            def test_x():
+                assert values == ["package2"]
+        """
+            )
+        )
+        reprec = testdir.inline_run()
+        reprec.assertoutcome(passed=2)
+
+    def test_package_fixture_complex(self, testdir):
+        testdir.makepyfile(
+            __init__="""\
+            values = []
+        """
+        )
+        package = testdir.mkdir("package")
+        package.join("__init__.py").write("")
+        package.join("conftest.py").write(
+            dedent(
+                """\
+            import pytest
+            from .. import values
+            @pytest.fixture(scope="package")
+            def one():
+                values.append("package")
+                yield values
+                values.pop()
+            @pytest.fixture(scope="package", autouse=True)
+            def two():
+                values.append("package-auto")
+                yield values
+                values.pop()
+        """
+            )
+        )
+        package.join("test_x.py").write(
+            dedent(
+                """\
+            from .. import values
+            def test_package_autouse():
+                assert values == ["package-auto"]
+            def test_package(one):
+                assert values == ["package-auto", "package"]
+        """
+            )
+        )
+        reprec = testdir.inline_run()
+        reprec.assertoutcome(passed=2)
+

 class TestAutouseDiscovery(object):
    @pytest.fixture
@@ -3462,25 +3423,40 @@ class TestShowFixtures(object):
                pass


-@pytest.mark.parametrize("flavor", ["fixture", "yield_fixture"])
 class TestContextManagerFixtureFuncs(object):
+    @pytest.fixture(params=["fixture", "yield_fixture"])
+    def flavor(self, request, testdir, monkeypatch):
+        monkeypatch.setenv("PYTEST_FIXTURE_FLAVOR", request.param)
+        testdir.makepyfile(
+            test_context="""
+            import os
+            import pytest
+            import warnings
+            VAR = "PYTEST_FIXTURE_FLAVOR"
+            if VAR not in os.environ:
+                warnings.warn("PYTEST_FIXTURE_FLAVOR was not set, assuming fixture")
+                fixture = pytest.fixture
+            else:
+                fixture = getattr(pytest, os.environ[VAR])
+        """
+        )
+
    def test_simple(self, testdir, flavor):
        testdir.makepyfile(
            """
-            import pytest
-            @pytest.{flavor}
+            from __future__ import print_function
+            from test_context import fixture
+            @fixture
            def arg1():
                print ("setup")
                yield 1
                print ("teardown")
            def test_1(arg1):
-                print ("test1 %s" % arg1)
+                print ("test1", arg1)
            def test_2(arg1):
-                print ("test2 %s" % arg1)
+                print ("test2", arg1)
                assert 0
-        """.format(
-                flavor=flavor
-            )
+        """
        )
        result = testdir.runpytest("-s")
        result.stdout.fnmatch_lines(
@@ -3497,19 +3473,18 @@ class TestContextManagerFixtureFuncs(object):
    def test_scoped(self, testdir, flavor):
        testdir.makepyfile(
            """
-            import pytest
-            @pytest.{flavor}(scope="module")
+            from __future__ import print_function
+            from test_context import fixture
+            @fixture(scope="module")
            def arg1():
                print ("setup")
                yield 1
                print ("teardown")
            def test_1(arg1):
-                print ("test1 %s" % arg1)
+                print ("test1", arg1)
            def test_2(arg1):
-                print ("test2 %s" % arg1)
-        """.format(
-                flavor=flavor
-            )
+                print ("test2", arg1)
+        """
        )
        result = testdir.runpytest("-s")
        result.stdout.fnmatch_lines(
@@ -3524,16 +3499,14 @@ class TestContextManagerFixtureFuncs(object):
    def test_setup_exception(self, testdir, flavor):
        testdir.makepyfile(
            """
-            import pytest
-            @pytest.{flavor}(scope="module")
+            from test_context import fixture
+            @fixture(scope="module")
            def arg1():
                pytest.fail("setup")
                yield 1
            def test_1(arg1):
                pass
-        """.format(
-                flavor=flavor
-            )
+        """
        )
        result = testdir.runpytest("-s")
        result.stdout.fnmatch_lines(
@@ -3546,16 +3519,14 @@ class TestContextManagerFixtureFuncs(object):
    def test_teardown_exception(self, testdir, flavor):
        testdir.makepyfile(
            """
-            import pytest
-            @pytest.{flavor}(scope="module")
+            from test_context import fixture
+            @fixture(scope="module")
            def arg1():
                yield 1
                pytest.fail("teardown")
            def test_1(arg1):
                pass
-        """.format(
-                flavor=flavor
-            )
+        """
        )
        result = testdir.runpytest("-s")
        result.stdout.fnmatch_lines(
@@ -3568,16 +3539,14 @@ class TestContextManagerFixtureFuncs(object):
    def test_yields_more_than_one(self, testdir, flavor):
        testdir.makepyfile(
            """
-            import pytest
-            @pytest.{flavor}(scope="module")
+            from test_context import fixture
+            @fixture(scope="module")
            def arg1():
                yield 1
                yield 2
            def test_1(arg1):
                pass
-        """.format(
-                flavor=flavor
-            )
+        """
        )
        result = testdir.runpytest("-s")
        result.stdout.fnmatch_lines(
@@ -3590,15 +3559,13 @@ class TestContextManagerFixtureFuncs(object):
    def test_custom_name(self, testdir, flavor):
        testdir.makepyfile(
            """
-            import pytest
-            @pytest.{flavor}(name='meow')
+            from test_context import fixture
+            @fixture(name='meow')
            def arg1():
                return 'mew'
            def test_1(meow):
                print(meow)
-        """.format(
-                flavor=flavor
-            )
+        """
        )
        result = testdir.runpytest("-s")
        result.stdout.fnmatch_lines("*mew*")
@@ -3606,8 +3573,8 @@ class TestContextManagerFixtureFuncs(object):

 class TestParameterizedSubRequest(object):
    def test_call_from_fixture(self, testdir):
-        testfile = testdir.makepyfile(
-            """
+        testdir.makepyfile(
+            test_call_from_fixture="""
            import pytest

            @pytest.fixture(params=[0, 1, 2])
@@ -3628,18 +3595,16 @@ class TestParameterizedSubRequest(object):
            E*Failed: The requested fixture has no parameter defined for the current test.
            E*
            E*Requested fixture 'fix_with_param' defined in:
-            E*{}:4
+            E*test_call_from_fixture.py:4
            E*Requested here:
-            E*{}:9
+            E*test_call_from_fixture.py:9
            *1 error*
-            """.format(
-                testfile.basename, testfile.basename
-            )
+            """
        )

    def test_call_from_test(self, testdir):
-        testfile = testdir.makepyfile(
-            """
+        testdir.makepyfile(
+            test_call_from_test="""
            import pytest

            @pytest.fixture(params=[0, 1, 2])
@@ -3656,17 +3621,15 @@ class TestParameterizedSubRequest(object):
            E*Failed: The requested fixture has no parameter defined for the current test.
            E*
            E*Requested fixture 'fix_with_param' defined in:
-            E*{}:4
+            E*test_call_from_test.py:4
            E*Requested here:
-            E*{}:8
+            E*test_call_from_test.py:8
            *1 failed*
-            """.format(
-                testfile.basename, testfile.basename
-            )
+            """
        )

    def test_external_fixture(self, testdir):
-        conffile = testdir.makeconftest(
+        testdir.makeconftest(
            """
            import pytest

@@ -3676,8 +3639,8 @@ class TestParameterizedSubRequest(object):
            """
        )

-        testfile = testdir.makepyfile(
-            """
+        testdir.makepyfile(
+            test_external_fixture="""
            def test_foo(request):
                request.getfixturevalue('fix_with_param')
            """
@@ -3688,13 +3651,11 @@ class TestParameterizedSubRequest(object):
            E*Failed: The requested fixture has no parameter defined for the current test.
            E*
            E*Requested fixture 'fix_with_param' defined in:
-            E*{}:4
+            E*conftest.py:4
            E*Requested here:
-            E*{}:2
+            E*test_external_fixture.py:2
            *1 failed*
-            """.format(
-                conffile.basename, testfile.basename
-            )
+            """
        )

    def test_non_relative_path(self, testdir):
@@ -3733,13 +3694,11 @@ class TestParameterizedSubRequest(object):
            E*Failed: The requested fixture has no parameter defined for the current test.
            E*
            E*Requested fixture 'fix_with_param' defined in:
-            E*{}:5
+            E*fix.py:5
            E*Requested here:
-            E*{}:5
+            E*test_foos.py:5
            *1 failed*
-            """.format(
-                fixfile.strpath, testfile.basename
-            )
+            """
        )


@@ -3792,17 +3751,28 @@ def test_pytest_fixture_setup_and_post_finalizer_hook(testdir):
 class TestScopeOrdering(object):
    """Class of tests that ensure fixtures are ordered based on their scopes (#2405)"""

-    @pytest.mark.parametrize("use_mark", [True, False])
-    def test_func_closure_module_auto(self, testdir, use_mark):
+    @pytest.mark.parametrize("variant", ["mark", "autouse"])
+    @pytest.mark.issue(github="#2405")
+    def test_func_closure_module_auto(self, testdir, variant, monkeypatch):
        """Semantically identical to the example posted in #2405 when ``use_mark=True``"""
+        monkeypatch.setenv("FIXTURE_ACTIVATION_VARIANT", variant)
        testdir.makepyfile(
            """
+            import warnings
+            import os
            import pytest
+            VAR = 'FIXTURE_ACTIVATION_VARIANT'
+            VALID_VARS = ('autouse', 'mark')

-            @pytest.fixture(scope='module', autouse={autouse})
+            VARIANT = os.environ.get(VAR)
+            if VARIANT is None or VARIANT not in VALID_VARS:
+                warnings.warn("{!r} is not  in {}, assuming autouse".format(VARIANT, VALID_VARS) )
+                variant = 'mark'
+
+            @pytest.fixture(scope='module', autouse=VARIANT == 'autouse')
            def m1(): pass

-            if {use_mark}:
+            if VARIANT=='mark':
                pytestmark = pytest.mark.usefixtures('m1')

            @pytest.fixture(scope='function', autouse=True)
@@ -3810,9 +3780,7 @@ class TestScopeOrdering(object):

            def test_func(m1):
                pass
-        """.format(
-                autouse=not use_mark, use_mark=use_mark
-            )
+        """
        )
        items, _ = testdir.inline_genitems()
        request = FixtureRequest(items[0])
@@ -3833,6 +3801,10 @@ class TestScopeOrdering(object):
            def s1():
                FIXTURE_ORDER.append('s1')

+            @pytest.fixture(scope="package")
+            def p1():
+                FIXTURE_ORDER.append('p1')
+
            @pytest.fixture(scope="module")
            def m1():
                FIXTURE_ORDER.append('m1')
@@ -3853,16 +3825,20 @@ class TestScopeOrdering(object):
            def f2():
                FIXTURE_ORDER.append('f2')

-            def test_foo(f1, m1, f2, s1): pass
+            def test_foo(f1, p1, m1, f2, s1): pass
        """
        )
        items, _ = testdir.inline_genitems()
        request = FixtureRequest(items[0])
        # order of fixtures based on their scope and position in the parameter list
-        assert request.fixturenames == "s1 my_tmpdir_factory m1 f1 f2 my_tmpdir".split()
+        assert (
+            request.fixturenames == "s1 my_tmpdir_factory p1 m1 f1 f2 my_tmpdir".split()
+        )
        testdir.runpytest()
        # actual fixture execution differs: dependent fixtures must be created first ("my_tmpdir")
-        assert pytest.FIXTURE_ORDER == "s1 my_tmpdir_factory m1 my_tmpdir f1 f2".split()
+        assert (
+            pytest.FIXTURE_ORDER == "s1 my_tmpdir_factory p1 m1 my_tmpdir f1 f2".split()
+        )

    def test_func_closure_module(self, testdir):
        testdir.makepyfile(
@@ -3931,9 +3907,13 @@ class TestScopeOrdering(object):
                "sub/conftest.py": """
                import pytest

+                @pytest.fixture(scope='package', autouse=True)
+                def p_sub(): pass
+
                @pytest.fixture(scope='module', autouse=True)
                def m_sub(): pass
            """,
+                "sub/__init__.py": "",
                "sub/test_func.py": """
                import pytest

@@ -3950,7 +3930,7 @@ class TestScopeOrdering(object):
        )
        items, _ = testdir.inline_genitems()
        request = FixtureRequest(items[0])
-        assert request.fixturenames == "m_conf m_sub m_test f1".split()
+        assert request.fixturenames == "p_sub m_conf m_sub m_test f1".split()

    def test_func_closure_all_scopes_complex(self, testdir):
        """Complex test involving all scopes and mixing autouse with normal fixtures"""
@@ -3960,8 +3940,12 @@ class TestScopeOrdering(object):

            @pytest.fixture(scope='session')
            def s1(): pass
+
+            @pytest.fixture(scope='package', autouse=True)
+            def p1(): pass
        """
        )
+        testdir.makepyfile(**{"__init__.py": ""})
        testdir.makepyfile(
            """
            import pytest
@@ -3990,4 +3974,4 @@ class TestScopeOrdering(object):
        )
        items, _ = testdir.inline_genitems()
        request = FixtureRequest(items[0])
-        assert request.fixturenames == "s1 m1 m2 c1 f2 f1".split()
+        assert request.fixturenames == "s1 p1 m1 m2 c1 f2 f1".split()
--- a/testing/python/metafunc.py
+++ b/testing/python/metafunc.py
@@ -212,6 +212,9 @@ class TestMetafunc(object):
    @hypothesis.settings(
        deadline=400.0
    )  # very close to std deadline and CI boxes are not reliable in CPU power
+    @pytest.mark.xfail(
+        sys.platform.startswith("win32"), reason="flaky #3707", strict=False
+    )
    def test_idval_hypothesis(self, value):
        from _pytest.python import _idval

--- a/testing/test_assertion.py
+++ b/testing/test_assertion.py
@@ -12,7 +12,6 @@ from _pytest.assertion import truncate
 PY3 = sys.version_info >= (3, 0)


-@pytest.fixture
 def mock_config():
    class Config(object):
        verbose = False
@@ -768,15 +767,15 @@ def test_rewritten(testdir):
    assert testdir.runpytest().ret == 0


-def test_reprcompare_notin(mock_config):
-    detail = plugin.pytest_assertrepr_compare(
-        mock_config, "not in", "foo", "aaafoobbb"
-    )[1:]
+def test_reprcompare_notin():
+    config = mock_config()
+    detail = plugin.pytest_assertrepr_compare(config, "not in", "foo", "aaafoobbb")[1:]
    assert detail == ["'foo' is contained here:", "  aaafoobbb", "?    +++"]


-def test_reprcompare_whitespaces(mock_config):
-    detail = plugin.pytest_assertrepr_compare(mock_config, "==", "\r\n", "\n")
+def test_reprcompare_whitespaces():
+    config = mock_config()
+    detail = plugin.pytest_assertrepr_compare(config, "==", "\r\n", "\n")
    assert detail == [
        r"'\r\n' == '\n'",
        r"Strings contain only whitespace, escaping them using repr()",
--- a/testing/test_cacheprovider.py
+++ b/testing/test_cacheprovider.py
@@ -1,5 +1,7 @@
 from __future__ import absolute_import, division, print_function
+
 import sys
+
 import py
 import _pytest
 import pytest
@@ -25,7 +27,7 @@ class TestNewAPI(object):
        cache = config.cache
        pytest.raises(TypeError, lambda: cache.set("key/name", cache))
        config.cache.set("key/name", 0)
-        config.cache._getvaluepath("key/name").write("123invalid")
+        config.cache._getvaluepath("key/name").write_bytes(b"123invalid")
        val = config.cache.get("key/name", -2)
        assert val == -2

@@ -813,3 +815,30 @@ class TestNewFirst(object):
                "*test_1/test_1.py::test_1[2*",
            ]
        )
+
+
+class TestReadme(object):
+    def check_readme(self, testdir):
+        config = testdir.parseconfigure()
+        readme = config.cache._cachedir.joinpath("README.md")
+        return readme.is_file()
+
+    def test_readme_passed(self, testdir):
+        testdir.makepyfile(
+            """
+            def test_always_passes():
+                assert 1
+        """
+        )
+        testdir.runpytest()
+        assert self.check_readme(testdir) is True
+
+    def test_readme_failed(self, testdir):
+        testdir.makepyfile(
+            """
+            def test_always_passes():
+                assert 0
+        """
+        )
+        testdir.runpytest()
+        assert self.check_readme(testdir) is True
--- a/testing/test_collection.py
+++ b/testing/test_collection.py
@@ -647,7 +647,7 @@ class Test_getinitialnodes(object):
        col = testdir.getnode(config, x)
        assert isinstance(col, pytest.Module)
        assert col.name == "x.py"
-        assert col.parent.parent is None
+        assert col.parent.parent.parent is None
        for col in col.listchain():
            assert col.config is config

@@ -904,7 +904,7 @@ def test_continue_on_collection_errors_maxfail(testdir):

 def test_fixture_scope_sibling_conftests(testdir):
    """Regression test case for https://github.com/pytest-dev/pytest/issues/2836"""
-    foo_path = testdir.mkpydir("foo")
+    foo_path = testdir.mkdir("foo")
    foo_path.join("conftest.py").write(
        _pytest._code.Source(
            """
--- a/testing/test_conftest.py
+++ b/testing/test_conftest.py
@@ -10,9 +10,7 @@ from _pytest.main import EXIT_NOTESTSCOLLECTED, EXIT_USAGEERROR

@pytest.fixture(scope="module", params=["global", "inpackage"])
 def basedir(request, tmpdir_factory):
-    from _pytest.tmpdir import tmpdir
-
-    tmpdir = tmpdir(request, tmpdir_factory)
+    tmpdir = tmpdir_factory.mktemp("basedir", numbered=True)
    tmpdir.ensure("adir/conftest.py").write("a=1 ; Directory = 3")
    tmpdir.ensure("adir/b/conftest.py").write("b=2 ; a = 1.5")
    if request.param == "inpackage":
--- a/testing/test_junitxml.py
+++ b/testing/test_junitxml.py
@@ -7,6 +7,8 @@ import os
 from _pytest.junitxml import LogXML
 import pytest

+from _pytest.reports import BaseReport
+

 def runandparse(testdir, *args):
    resultpath = testdir.tmpdir.join("junit.xml")
@@ -940,7 +942,6 @@ def test_unicode_issue368(testdir):
    path = testdir.tmpdir.join("test.xml")
    log = LogXML(str(path), None)
    ustr = py.builtin._totext("ВНИ!", "utf-8")
-    from _pytest.runner import BaseReport

    class Report(BaseReport):
        longrepr = ustr
@@ -1137,7 +1138,6 @@ def test_fancy_items_regression(testdir):
 def test_global_properties(testdir):
    path = testdir.tmpdir.join("test_global_properties.xml")
    log = LogXML(str(path), None)
-    from _pytest.runner import BaseReport

    class Report(BaseReport):
        sections = []
@@ -1173,7 +1173,6 @@ def test_url_property(testdir):
    test_url = "http://www.github.com/pytest-dev"
    path = testdir.tmpdir.join("test_url_property.xml")
    log = LogXML(str(path), None)
-    from _pytest.runner import BaseReport

    class Report(BaseReport):
        longrepr = "FooBarBaz"
--- a/testing/test_mark.py
+++ b/testing/test_mark.py
@@ -1145,6 +1145,15 @@ def test_addmarker_getmarker():
    node.get_marker("b").combined


+def test_addmarker_order():
+    node = Node("Test", config=mock.Mock(), session=mock.Mock(), nodeid="Test")
+    node.add_marker("a")
+    node.add_marker("b")
+    node.add_marker("c", append=False)
+    extracted = [x.name for x in node.iter_markers()]
+    assert extracted == ["c", "a", "b"]
+
+
@pytest.mark.issue("https://github.com/pytest-dev/pytest/issues/3605")
@pytest.mark.filterwarnings("ignore")
 def test_markers_from_parametrize(testdir):
--- a/testing/test_pdb.py
+++ b/testing/test_pdb.py
@@ -696,3 +696,40 @@ class TestDebuggingBreakpoints(object):
        assert "1 failed" in rest
        assert "reading from stdin while output" not in rest
        TestPDB.flush(child)
+
+
+class TestTraceOption:
+    def test_trace_sets_breakpoint(self, testdir):
+        p1 = testdir.makepyfile(
+            """
+            def test_1():
+                assert True
+            """
+        )
+        child = testdir.spawn_pytest("--trace " + str(p1))
+        child.expect("test_1")
+        child.expect("(Pdb)")
+        child.sendeof()
+        rest = child.read().decode("utf8")
+        assert "1 passed" in rest
+        assert "reading from stdin while output" not in rest
+        TestPDB.flush(child)
+
+    def test_trace_against_yield_test(self, testdir):
+        p1 = testdir.makepyfile(
+            """
+            def is_equal(a, b):
+                assert a == b
+
+            def test_1():
+                yield is_equal, 1, 1
+            """
+        )
+        child = testdir.spawn_pytest("--trace " + str(p1))
+        child.expect("is_equal")
+        child.expect("(Pdb)")
+        child.sendeof()
+        rest = child.read().decode("utf8")
+        assert "1 passed" in rest
+        assert "reading from stdin while output" not in rest
+        TestPDB.flush(child)
--- a/testing/test_pluginmanager.py
+++ b/testing/test_pluginmanager.py
@@ -66,6 +66,7 @@ class TestPytestPluginInteractions(object):
        result = testdir.runpython(p)
        assert result.ret == 0

+    @pytest.mark.filterwarnings("ignore:pytest_namespace is deprecated")
    def test_do_ext_namespace(self, testdir):
        testdir.makeconftest(
            """
--- a/testing/test_runner.py
+++ b/testing/test_runner.py
@@ -8,7 +8,7 @@ import py
 import pytest
 import sys
 import types
-from _pytest import runner, main, outcomes
+from _pytest import runner, main, outcomes, reports


 class TestSetupState(object):
@@ -459,10 +459,10 @@ class TestSessionReports(object):


 reporttypes = [
-    runner.BaseReport,
-    runner.TestReport,
-    runner.TeardownErrorReport,
-    runner.CollectReport,
+    reports.BaseReport,
+    reports.TestReport,
+    reports.TeardownErrorReport,
+    reports.CollectReport,
 ]


--- a/testing/test_tmpdir.py
+++ b/testing/test_tmpdir.py
@@ -3,35 +3,11 @@ import sys
 import py
 import pytest

-from _pytest.tmpdir import tmpdir

-
-def test_funcarg(testdir):
-    testdir.makepyfile(
-        """
-            def pytest_generate_tests(metafunc):
-                metafunc.addcall(id='a')
-                metafunc.addcall(id='b')
-            def test_func(tmpdir): pass
-    """
-    )
-    from _pytest.tmpdir import TempdirFactory
-
-    reprec = testdir.inline_run()
-    calls = reprec.getcalls("pytest_runtest_setup")
-    item = calls[0].item
-    config = item.config
-    tmpdirhandler = TempdirFactory(config)
-    item._initrequest()
-    p = tmpdir(item._request, tmpdirhandler)
-    assert p.check()
-    bn = p.basename.strip("0123456789")
-    assert bn.endswith("test_func_a_")
-    item.name = "qwe/\\abc"
-    p = tmpdir(item._request, tmpdirhandler)
-    assert p.check()
-    bn = p.basename.strip("0123456789")
-    assert bn == "qwe__abc"
+def test_tmpdir_fixture(testdir):
+    p = testdir.copy_example("tmpdir/tmpdir_fixture.py")
+    results = testdir.runpytest(p)
+    results.stdout.fnmatch_lines("*1 passed*")


 def test_ensuretemp(recwarn):
--- a/tox.ini
+++ b/tox.ini
@@ -139,7 +139,7 @@ commands =
 [testenv:regen]
 changedir = doc/en
 skipsdist = True
-basepython = python3.5
+basepython = python3.6
 deps =
    sphinx
    PyYAML
@@ -198,7 +198,7 @@ rsyncdirs = tox.ini pytest.py _pytest testing
 python_files = test_*.py *_test.py testing/*/*.py
 python_classes = Test Acceptance
 python_functions = test
-norecursedirs = .tox ja .hg cx_freeze_source
+norecursedirs = .tox ja .hg cx_freeze_source testing/example_scripts
 xfail_strict=true
 filterwarnings =
    error
@@ -210,7 +210,9 @@ filterwarnings =
    ignore:.*type argument to addoption.*:DeprecationWarning
    # produced by python >=3.5 on execnet (pytest-xdist)
    ignore:.*inspect.getargspec.*deprecated, use inspect.signature.*:DeprecationWarning
-
+    #pytests own futurewarnings
+    ignore::_pytest.experiments.PytestExerimentalApiWarning
+pytester_example_dir = testing/example_scripts
 [flake8]
 max-line-length = 120
 ignore = E203,W503
Author	SHA1	Message	Date
Bruno Oliveira	997ef59306	Fix typos in CHANGELOG	2018-07-30 18:31:35 -03:00
Bruno Oliveira	60b1913ba2	Preparing release version 3.7.0	2018-07-30 20:14:42 +00:00
Bruno Oliveira	2c09930b6d	Use proper quotes for python 3.7 on travis.yml	2018-07-30 20:13:17 +00:00
Bruno Oliveira	d461e931dd	Use python 3.6 for regendoc	2018-07-30 20:12:52 +00:00
Bruno Oliveira	eada0b1fd7	Merge remote-tracking branch 'upstream/master' into release-3.7.0	2018-07-30 20:12:30 +00:00
Bruno Oliveira	150535b6c1	Merge pull request #3696 from abrammer/approx_numpy_tolerance_bugfix bugfix in ApproxNumpy initialisation, use keywords for arguments to fix	2018-07-30 17:09:18 -03:00
Ronny Pfannschmidt	f1ec02cdcd	Merge pull request #3733 from nicoddemus/py37 Test with Python 3.7 on Travis and AppVeyor	2018-07-30 20:02:03 +02:00
Ronny Pfannschmidt	9f5d73d44a	Merge pull request #3735 from nicoddemus/deprecate-pytest-namespace Deprecate pytest namespace	2018-07-30 19:55:45 +02:00
Bruno Oliveira	8609f8d25a	Move warning definition to deprecated module	2018-07-30 14:25:29 -03:00
Bruno Oliveira	953a618102	Update CHANGELOG entry about pytest_namespace deprecation	2018-07-30 12:18:37 -03:00
Bruno Oliveira	cf6d8e7e53	Fix test and update warning in pytest_namespace docs	2018-07-30 12:16:42 -03:00
Bruno Oliveira	8af78f417f	Merge pull request #3732 from nicoddemus/merge-master-into-features Merge master into features	2018-07-30 07:26:19 -03:00
abrammer	535fd1f311	may as well include inf test while we're at it	2018-07-29 23:12:04 -04:00
abrammer	762eaf443a	update changelog to include the addition of tests	2018-07-29 22:57:39 -04:00
abrammer	330640eb96	update tests to check tolerance args and expecing nan in numpy arrays	2018-07-29 22:47:38 -04:00
Bruno Oliveira	e3d412d1f4	Warn when implementations exist for pytest_namespace hook This hook has been deprecated and will be removed in the future. Fix #2639	2018-07-29 22:20:23 -03:00
Bruno Oliveira	6f9a12a8a3	Merge pull request #3486 from ammarnajjar/last-failed-no-failures_docs_correction --last-failed-no-failures docs correction	2018-07-29 21:26:03 -03:00
Bruno Oliveira	0e47599572	Merge remote-tracking branch 'upstream/master' into merge-master-into-features	2018-07-29 21:15:51 -03:00
Bruno Oliveira	c480223e88	Test with Python 3.7 on Travis and AppVeyor	2018-07-29 21:14:38 -03:00
Bruno Oliveira	0b522d40a7	Merge pull request #3734 from nicoddemus/fix-docs Fix reference to _Result in docs	2018-07-29 21:14:09 -03:00
Bruno Oliveira	d900a6c8bd	Merge pull request #3731 from asottile/pygrep_hooks Use upstream rst-backticks hook	2018-07-29 20:52:28 -03:00
Bruno Oliveira	fe46fbb719	Fix reference to _Result in docs	2018-07-29 20:50:24 -03:00
Anthony Sottile	8d401cdb9d	Use upstream rst-backticks hook	2018-07-29 15:46:06 -07:00
Bruno Oliveira	3f3f6f1be4	Merge pull request #3729 from nicoddemus/fix-changelog-titles Fix "Pytest" to "pytest" in the CHANGELOG	2018-07-29 19:42:24 -03:00
Bruno Oliveira	b6da5cc54c	Fix "Pytest" to "pytest" in the CHANGELOG Now that we have fixed towncrier to render the proper title, seems fitting to update the others	2018-07-28 12:57:18 -03:00
Bruno Oliveira	eaeeedc9c3	Merge pull request #3728 from nicoddemus/release-3.6.4 Release 3.6.4	2018-07-28 12:53:49 -03:00
Kale Kundert	bf127a63b2	Need to iterate over the flattened array.	2018-07-27 11:24:42 -07:00
Bruno Oliveira	fe16f81da1	Merge pull request #3705 from nicoddemus/deprecate-call-fixture-func Deprecate calling fixture functions directly	2018-07-27 15:09:09 -03:00
Bruno Oliveira	d0ba242c46	Implement change suggested by @kalekundert in PR	2018-07-27 15:07:20 -03:00
Bruno Oliveira	57b0c60cb4	Remove Testdir.run_example as recommended	2018-07-26 20:10:40 -03:00
Bruno Oliveira	6e57d123bb	Mark test_idval_hypothesis as flaky on Windows (#3707 )	2018-07-26 19:58:42 -03:00
Bruno Oliveira	011f88f7e7	Deprecate calling fixture functions directly This will now issue a RemovedInPytest4Warning when the user calls a fixture function directly, instead of requesting it from test functions as is expected Fix #3661	2018-07-26 19:58:42 -03:00
Bruno Oliveira	2eb9301ad5	Improve CHANGELOG	2018-07-25 08:09:31 -03:00
abrammer	f0db64ac2e	drop the duplicate approx call update test to include both np.array(actual) and np.array(expected)	2018-07-24 21:18:44 -04:00
abrammer	514ca6f4ad	add test wrt #3695 checking numpy array tolerance args	2018-07-23 23:40:06 -04:00
Ronny Pfannschmidt	f8749eeb5c	Merge pull request #3708 from nicoddemus/small-refactors Small refactorings	2018-07-23 06:53:08 +02:00
Bruno Oliveira	f5165064ee	Make yield_fixture just call fixture to do its work Since fixture and yield_fixture are identical, they should call the same code; as it was, the code inside them was already starting to deviate.	2018-07-22 09:41:03 -03:00
Bruno Oliveira	c9a0881309	Isolate the code that resolves the fixturefunc to a separate function pytest_fixture_setup was somewhat convoluted because it was trying to do too many things.	2018-07-22 09:37:41 -03:00
Bruno Oliveira	5167933395	Move teardown code of yield fixtures to a partial to avoid leaks As it were before, it was keeping a reference to fixturefunc and it alive when an error occurred	2018-07-22 09:27:34 -03:00
Alan Brammer	75db608479	update changelog	2018-07-18 17:56:00 -04:00
Alan	7bff5866b1	bugfix in ApproxNumpy initialisation, use keywords for arguments now	2018-07-18 17:29:55 -04:00
Bruno Oliveira	0bb29d5649	Merge pull request #3685 from nicoddemus/merge-master-into-features Merge master into features	2018-07-15 16:53:39 -03:00
Bruno Oliveira	db33f03c15	Merge pull request #3681 from tadeoos/980-fix-truncated-locals-in-verbose Fix truncated locals in verbose mode	2018-07-15 14:43:15 -03:00
Bruno Oliveira	ac9ceaacd8	Merge remote-tracking branch 'upstream/master' into merge-master-into-features	2018-07-15 11:54:14 -03:00
Tadek Teleżyński	d2fe619120	Fix truncated locals in verbose mode	2018-07-15 11:30:26 -03:00
Bruno Oliveira	f6ceedd15b	Merge pull request #3636 from RonnyPfannschmidt/fixturetest-examples [RFC] Fixturetest examples - move test contents to use example scripts for contents	2018-07-11 23:29:33 -03:00
Bruno Oliveira	5226c7fac3	Merge pull request #3665 from nicoddemus/changelog-tweaks Small tweaks to the changelog entries	2018-07-10 21:12:50 -03:00
Bruno Oliveira	803302e70c	Fix end-of-line in 2220.bugfix.rst	2018-07-07 11:13:48 -03:00
Bruno Oliveira	05f1d0d3ef	Update README for CHANGELOG about using multiple paragraphs	2018-07-07 11:07:13 -03:00
Bruno Oliveira	1cd62f8c38	Update CHANGELOG template to put issue links at the start of entries This allows us to use the new multi-line entries available with towncrier 18.6.0	2018-07-07 11:02:33 -03:00
Bruno Oliveira	a522fc745a	Small tweaks to the changelog entries	2018-07-07 10:43:37 -03:00
Bruno Oliveira	303133f013	Merge pull request #3647 from jeffreyrack/3610-add-trace-option 3610 add trace option	2018-07-07 10:05:34 -03:00
Ronny Pfannschmidt	1e94ac784f	Merge pull request #3389 from jonozzz/features Add package scoped fixtures #2283	2018-07-06 11:42:36 +02:00
Bruno Oliveira	027d2336b8	Add minimal docs for package-scoped fixtures (experimental)	2018-07-05 21:56:31 -03:00
Bruno Oliveira	3c19370cec	Merge remote-tracking branch 'upstream/features' into jonozzz/features	2018-07-05 18:15:17 -03:00
Bruno Oliveira	3f5e06ecc4	Merge pull request #3659 from nicoddemus/merge-master-into-features Merge master into features	2018-07-04 21:11:28 -03:00
Bruno Oliveira	7696d5371a	Merge remote-tracking branch 'upstream/master' into features	2018-07-04 18:49:35 -03:00
Jeffrey Rackauckas	067de257e1	Fix test_pdb.py with pexpect	2018-07-02 21:03:21 -07:00
Jeffrey Rackauckas	4a925ef5e9	Fixing bug in test.	2018-07-02 20:29:59 -07:00
Jeffrey Rackauckas	4afb8c428b	Fix python 2 issues	2018-07-02 20:20:42 -07:00
Jeffrey Rackauckas	2f1a2cf07f	Fixing --trace test.	2018-07-02 19:55:08 -07:00
Jeffrey Rackauckas	6cc4fe2412	Fixing bad indentation	2018-07-02 19:53:46 -07:00
Jeffrey Rackauckas	10a8691eca	Add support for yielded functions.	2018-07-02 19:46:26 -07:00
Jeffrey Rackauckas	b75320ba95	Fix --trace option with yield tests.	2018-07-02 19:08:41 -07:00
Jeffrey Rackauckas	bc268a58d1	Adding needed newline	2018-07-01 20:22:50 -07:00
Jeffrey Rackauckas	0b70477930	Fix linting issues.	2018-07-01 20:18:00 -07:00
Jeffrey Rackauckas	8801162275	Fixing tabbing in usage.rst.	2018-07-01 18:54:04 -07:00
Jeffrey Rackauckas	a604a71185	Fixing usage.rst title.	2018-07-01 18:53:18 -07:00
Jeffrey Rackauckas	66fa6bb42e	Fix flake8 issues.	2018-07-01 18:50:57 -07:00
Jeffrey Rackauckas	713d32c4da	Adding documentation for the --trace option.	2018-07-01 18:49:39 -07:00
Jeffrey Rackauckas	57198d477b	Adding changelog entry for the --trace option.	2018-07-01 12:14:35 -07:00
Jeffrey Rackauckas	533f4cc10c	Fix test to pass	2018-06-30 21:36:27 -07:00
Jeffrey Rackauckas	a46b94950c	Properly set immediately_break value	2018-06-30 21:32:25 -07:00
Jeffrey Rackauckas	952bbefaac	Add initial test.	2018-06-30 18:26:58 -07:00
Jeffrey Rackauckas	54d3cd587d	Adding the --trace option.	2018-06-30 18:09:06 -07:00
Ronny Pfannschmidt	0fd86ec8a8	move some fill fixture acceptance tests contents to the examples script folder	2018-06-29 10:58:33 +02:00
Ronny Pfannschmidt	4ae7e9788c	fix quotes in scope order test	2018-06-29 07:13:18 +02:00
Ronny Pfannschmidt	5582ad0445	remove use of formatting in test_func_closure_module_auto this makes it apparent that pytester should supply some kind of variable support	2018-06-29 07:07:03 +02:00
Ronny Pfannschmidt	982b614010	remove format calls for most fixture tests	2018-06-29 07:07:03 +02:00
Ronny Pfannschmidt	7845ab4bc3	remove test file formatting from TestContextManagerFixtureFuncs	2018-06-29 07:07:03 +02:00
Bruno Oliveira	8680dfc939	Merge pull request #3629 from egnartsms/issue-2220-param-breaks-dep Make test parametrization override indirect fixtures	2018-06-28 21:43:21 -03:00
Serhii Mozghovyi	76ac670f7d	Add changelog description	2018-06-28 23:42:18 +03:00
Bruno Oliveira	7b47dfb744	Merge pull request #3634 from RonnyPfannschmidt/merge-from-master Merge from master	2018-06-28 14:05:18 -03:00
Ronny Pfannschmidt	3c73d6298a	merge from master to features	2018-06-28 17:32:41 +02:00
Serhii Mozghovyi	c220fb235a	Minor fix (code improvement)	2018-06-28 14:53:06 +03:00
Serhii Mozghovyi	1dc5e97ac2	Make test parametrization override indirect fixtures	2018-06-28 14:32:29 +03:00
Bruno Oliveira	e9371a58a0	Merge pull request #3622 from RonnyPfannschmidt/builtin-serialize move report classes to own file to prepare for serialisazion	2018-06-27 15:17:09 -03:00
Bruno Oliveira	ea379ba10f	Merge pull request #3623 from RonnyPfannschmidt/pytester-runexamples Pytester runexamples	2018-06-27 09:13:29 -03:00
Ronny Pfannschmidt	17e01993d9	regendoc and invocation fixes	2018-06-27 08:28:21 +02:00
Ronny Pfannschmidt	8a6345515b	regendoc	2018-06-27 06:52:54 +02:00
Ronny Pfannschmidt	581d49635e	add docs and changelog	2018-06-27 06:52:36 +02:00
Ronny Pfannschmidt	e860ff7299	port some acceptance tests over to copy_example	2018-06-26 22:59:40 +02:00
Ronny Pfannschmidt	0672bc633f	enable pytester to run examples copied from the cwd	2018-06-26 22:48:33 +02:00
Ronny Pfannschmidt	2dfb52f7e0	fix rebase artifacts	2018-06-26 22:10:26 +02:00
Ronny Pfannschmidt	cc6eb9f83c	move test reports to own file	2018-06-26 22:09:15 +02:00
Ronny Pfannschmidt	6b239263da	Merge pull request #3620 from RonnyPfannschmidt/merge-from-master Merge from master	2018-06-26 21:56:09 +02:00
Ronny Pfannschmidt	89e0a3ec27	merge from master to features	2018-06-26 17:01:05 +02:00
Bruno Oliveira	5b186cd609	Merge pull request #3594 from pytest-dev/interal-pathlib [WIP] port cache plugin internals to pathlib	2018-06-25 11:09:36 -03:00
Ronny Pfannschmidt	5a156b3645	disable pypy on windows until scandir works for it	2018-06-24 22:54:26 +02:00
Ronny Pfannschmidt	95f00de0df	use paths for config.cache.get key	2018-06-23 00:14:06 +02:00
Ronny Pfannschmidt	c4c666cbc4	use Pathlib instead of path splitting	2018-06-23 00:07:57 +02:00
Ronny Pfannschmidt	ee30bf45c9	rebase onto readme addition	2018-06-23 00:03:10 +02:00
Ronny Pfannschmidt	603df1ea1c	whops, its supported starting with python 3.6, not python 3.5	2018-06-22 23:56:22 +02:00
Ronny Pfannschmidt	abbf73ad1a	use pathlib2 up to python3.4 - damn the stdlib	2018-06-22 23:56:22 +02:00
Ronny Pfannschmidt	1226cdab47	fix warnings and json dumping of cacheprovider	2018-06-22 23:56:22 +02:00
Ronny Pfannschmidt	ab80e0fba0	sort compat flake8 mess correctly	2018-06-22 23:56:22 +02:00
Ronny Pfannschmidt	fb992a0c81	reorder attr.ib specs	2018-06-22 23:56:22 +02:00
Ronny Pfannschmidt	23581d44bd	add missed file	2018-06-22 23:56:22 +02:00
Ronny Pfannschmidt	c7eb53317b	port cache plugin internals to pathlib warning logging got broken by detanglement from config	2018-06-22 23:56:22 +02:00
Bruno Oliveira	de98939ebf	Merge pull request #3608 from avirlrma/features add reamde for .pytest_cache	2018-06-21 21:05:23 -03:00
Bruno Oliveira	0d3914b626	Remove extra '\' left at the end of a line in cache's readme contents	2018-06-21 20:12:50 -03:00
Bruno Oliveira	eb94bce3e2	Change 3519 to trivial	2018-06-21 20:11:22 -03:00
Bruno Oliveira	b897008887	Improve CHANGELOG grammar	2018-06-21 20:09:32 -03:00
avirlrma	998d540b73	fixed changelog entry	2018-06-21 17:56:26 +05:30
avirlrma	c672bfa32e	added changelog entry moved cache readme tests to test_cacheprovider.py	2018-06-21 17:43:10 +05:30
avirlrma	8f1d8ac970	fixed linting errors ran black removed unused imports and variables	2018-06-21 15:15:55 +05:30
avirlrma	53d4710c62	added tests for .pytest_cache README Helper class to check if readme exists in .pytest_cache directory Tests to check for readme when tests pass and when they fail	2018-06-21 14:25:00 +05:30
avirlrma	31f089db6a	add reamde for .pytest_cache method - `ensure_readme()`	2018-06-21 13:14:58 +05:30
Bruno Oliveira	9d60cf25c0	Merge pull request #2207 from RonnyPfannschmidt/fix/519 add example scripts for issue #519	2018-06-15 15:05:18 -03:00
Bruno Oliveira	9e32b6ae48	Small typo and grammar fix	2018-06-15 15:05:00 -03:00
Ronny Pfannschmidt	99402cf1c0	add a readme to the example scripts	2018-06-15 20:02:01 +02:00
Ronny Pfannschmidt	3ac2ae3c8c	black	2018-06-15 18:13:45 +02:00
Ronny Pfannschmidt	ea906056fa	add the actually expected fixtureorder for #519	2018-06-15 18:04:24 +02:00
Ronny Pfannschmidt	c081c5ee23	add example scripts for issue #519	2018-06-15 18:04:24 +02:00
Bruno Oliveira	3dcdaab103	Merge pull request #3585 from wcooley/feature/3579-caplog-messages Add `messages` property to `caplog` fixture.	2018-06-15 12:41:33 -03:00
Wil Cooley	3615977608	Add `messages` property to `caplog` fixture.	2018-06-14 12:22:33 -07:00
Bruno Oliveira	94c41bec64	Merge pull request #3576 from RonnyPfannschmidt/addmarker-api fix addmarker - extract mark from markdecorator	2018-06-13 18:36:40 -03:00
Ronny Pfannschmidt	8d072205e9	fix whitespace	2018-06-13 22:00:22 +02:00
Bruno Oliveira	b5102d03a6	Fix add_marker docs	2018-06-13 14:57:10 -03:00
Ronny Pfannschmidt	791bb3502c	changelog	2018-06-13 17:29:42 +02:00
Ronny Pfannschmidt	eb0c6a8287	fix addmarker - extract mark from markdecorator	2018-06-13 17:27:00 +02:00
Ammar Najjar	9ddd573774	Issue #3295 : add changelog doc entry for adding a missing argument in the examples	2018-05-17 23:11:37 +02:00
Ammar Najjar	f99da9058f	Issue #3295 : Correct the usage of --last-failed-no-failures documentation - add the missing --last-failed argument in the presented examples, for they are missleading and lead to think that the missing argument is not needed.	2018-05-17 23:07:55 +02:00
turturica	7d0dba18de	Removed _CompatProperty("Package")	2018-04-27 10:23:15 -07:00
turturica	6fc7f07a80	Workaround for py36-xdist failure.	2018-04-26 23:05:03 -07:00
turturica	05b5b64379	Merge remote-tracking branch 'upstream/features' into features	2018-04-25 21:20:39 -07:00
turturica	229c8e551d	Fix parametrized fixtures reordering.	2018-04-25 18:44:54 -07:00
turturica	d483b401ee	Merge remote-tracking branch 'upstream/features' into features	2018-04-24 13:45:10 -07:00
turturica	acacf75f49	Added another package-scoped fixture test. Changed existing complex tests to use package fixtures.	2018-04-24 13:32:58 -07:00
turturica	f8350c6304	Fix an issue that popped up only on Windows.	2018-04-21 19:51:33 -07:00
turturica	fedc78522b	Build a stack of all previous packages instead of just the one closest to the initial argument(s). Address #3358 by caching nodes in a session dict.	2018-04-21 18:39:42 -07:00
turturica	b0474398ec	Fix a formatting error.	2018-04-20 18:18:44 -07:00
turturica	dc90c9108f	Collapse all parent nested package fixtures when pointing to a sub-node. Example: Given this hierarchy: p1.s1.s2.s3 I want to run pytest p1/s1/s2/s3/foo.py If there are any package fixtures defined at p1..s2 levels, they should also be executed.	2018-04-20 17:15:09 -07:00
turturica	69031d0033	Forgot one file from previous commit.	2018-04-20 15:54:21 -07:00
turturica	e44d4e6508	Merge remote-tracking branch 'upstream/features' into features	2018-04-20 15:21:24 -07:00
turturica	c416b1d935	Don't stop at the first package when looking up package-scoped fixtures. Example: package1.subpackage1 package1.subpackage2 package1's setup/teardown were executed again when exiting subpackage1 and entering subpackage2.	2018-04-20 15:04:58 -07:00
turturica	7d923c389e	Merge remote-tracking branch 'upstream/features' into features	2018-04-18 00:11:03 -07:00
turturica	c02e8d8b0d	Fix test collection when tests are passed as IDs at the command line. Note this is still broken due to #3358 .	2018-04-16 11:44:05 -07:00
turturica	35df2cdbee	Fix linting error.	2018-04-11 15:45:43 -07:00
turturica	2b1410895e	Add package scoped fixtures #2283	2018-04-11 15:39:42 -07:00