Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
104 commits
Select commit Hold shift + click to select a range
4f9bf02
Merge pull request #5522 from nicoddemus/merge-master-into-features
asottile Jun 29, 2019
be91c4d
Remove Request.getfuncargvalue
nicoddemus Jun 30, 2019
279733a
Remove support for 'code as string' from pytest.raises and pytest.warns
nicoddemus Jun 30, 2019
13f7f27
Remove 'message' parameter from pytest.raises
nicoddemus Jun 30, 2019
683b263
Remove explicit kwargs handling from raises, warns and ParameterSet.p…
nicoddemus Jun 30, 2019
647d89c
Move code about 'pytest_plugins' error to a more appropriate place
nicoddemus Jun 30, 2019
f2b7809
Move setup.cfg error message and tests to an appropriate location
nicoddemus Jun 30, 2019
7e58def
Remove 'pytest.config'
nicoddemus Jun 30, 2019
aa1955d
Remove 'tmpdir_factory.ensuretemp'
nicoddemus Jun 30, 2019
7b35405
Remove YIELD_TESTS from deprecated module as it is now an error
nicoddemus Jun 30, 2019
3a17c1b
Remove 'pytest_logwarning' hook
nicoddemus Jun 30, 2019
c470ade
Remove 'RemovedInPytest4Warning'
nicoddemus Jun 30, 2019
85cc12e
Move FIXTURE_FUNCTION_CALL constant to the point of error
nicoddemus Jun 30, 2019
0ed7aa2
Make 'request' a reserved name for fixtures
nicoddemus Jun 30, 2019
dfe54cd
Let context-managers for raises and warns handle unknown keyword argu…
nicoddemus Jul 3, 2019
1db1322
Apply workaround for multiple short options for Python <= 3.8
nicoddemus Jun 29, 2019
c54cbd6
Replace importlib_metadata with importlib.metadata on Python 3.8+
hroncok Jul 2, 2019
60a358f
Replace importlib_metadata with importlib.metadata on Python 3.… (#5539)
nicoddemus Jul 5, 2019
d7588b8
Merge remote-tracking branch 'upstream/master' into merge-master-into…
nicoddemus Jul 5, 2019
a43ba78
Include <testsuites> root tag in generated XML
nicoddemus Jul 3, 2019
3e669a2
Introduce Config.invocation_args and Config.invocation_plugins
nicoddemus Jul 5, 2019
6a9bf28
Apply review suggestions: use a simple struct for invocation params
nicoddemus Jul 6, 2019
4cda709
Add note about PYTEST_ADDOPTS
nicoddemus Jul 6, 2019
7a82285
Update CHANGELOG
nicoddemus Jul 6, 2019
aaa7e83
doctest: Add +NUMBER option to ignore irrelevant floating-point diffe…
drothlis Jul 8, 2019
2a23fda
docs: Tidy up doctest options section
drothlis Jul 8, 2019
d5cc0f2
changelog for new NUMBERS doctest option
drothlis Jul 8, 2019
e33736c
Merge master into features (#5559)
nicoddemus Jul 8, 2019
c1167ac
Add rudimentary mypy type checking
bluetech Jul 8, 2019
39a43db
Merge pull request #5575 from bluetech/mypy-initial
asottile Jul 9, 2019
3173815
Remove deprecated features (#5529)
nicoddemus Jul 9, 2019
602cd5e
Introduce Config.invocation_params (#5564)
nicoddemus Jul 10, 2019
f7747f5
Remove references to old-style classes in a couple error messages
bluetech Jul 10, 2019
4c590e0
Fix test_doctest.test_number_non_matches
drothlis Jul 11, 2019
a740ef2
docs: Document doctest +NUMBER limitation with strings
drothlis Jul 11, 2019
666acc9
doctest: Add +NUMBER option to ignore irrelevant floating-point… (#5576)
nicoddemus Jul 11, 2019
24a66db
Remove support code for unittest 2
nicoddemus Jul 9, 2019
e986272
remove the noop init of PyobjMixin
RonnyPfannschmidt Jul 12, 2019
13d750d
simplify the expression which transfers mark names to keywords
RonnyPfannschmidt Jul 12, 2019
4868d0d
Drop unittest2 support (#5565)
nicoddemus Jul 12, 2019
4480d3e
generate_tests: always use call_extra
RonnyPfannschmidt Jul 12, 2019
898028c
remove unused _get_xunit_setup_teardown
RonnyPfannschmidt Jul 12, 2019
0f8b462
Include <testsuites> root tag in generated XML (#5550)
nicoddemus Jul 12, 2019
2c071a0
refactor resolve_arg_value_types
RonnyPfannschmidt Jul 12, 2019
374c432
refactor finding xunit setup/teardown functions
RonnyPfannschmidt Jul 12, 2019
35a57a0
Use flake8's extend-ignore instead of ignore
bluetech Jul 14, 2019
866904a
Revert "Let context-managers for raises and warns handle unknown keyw…
bluetech Jul 14, 2019
d7ee3da
Type-annotate pytest.{exit,skip,fail,xfail,importorskip}
bluetech Jul 10, 2019
2dca68b
Type-annotate pytest.warns
bluetech Jul 10, 2019
55a570e
Type-annotate ExceptionInfo
bluetech Jul 10, 2019
56dcc9e
Type-annotate pytest.raises
bluetech Jul 10, 2019
14bf4cd
Make ExceptionInfo generic in the exception type
bluetech Jul 10, 2019
3f1fb62
Rework ExceptionInfo to not require manual __init__ call
bluetech Jul 11, 2019
11f1f79
Allow creating ExceptionInfo from existing exc_info for better typing
bluetech Jul 14, 2019
0225be5
saferepr: Remove dead SafeRepr.repr_unicode
bluetech Jul 14, 2019
0394ebf
saferepr: Use an __init__ instead of setting attributes after constru…
bluetech Jul 14, 2019
c7aacc9
saferepr: Remove unused setting of max_other
bluetech Jul 14, 2019
499fda2
Various cleanups in src/_pytest/python.py (#5599)
nicoddemus Jul 14, 2019
129600d
saferepr: Avoid indirect function calls
bluetech Jul 14, 2019
9258fd1
Merge pull request #5603 from bluetech/saferepr-simplify
bluetech Jul 16, 2019
faf222f
Merge pull request #5593 from bluetech/type-annotations-1
bluetech Jul 16, 2019
fd8f92d
Run mypy on src/ and testing/ together
bluetech Jul 14, 2019
104f8fc
Update mypy from 0.711 to 0.720
bluetech Jul 14, 2019
8d413c1
Allow tuple of exceptions in ExceptionInfo.errisinstance
bluetech Jul 16, 2019
65aee1e
Allow bytes for OutcomeException(msg=...)
bluetech Jul 14, 2019
7d1c697
Remove a no-longer-needed check if enum is available
bluetech Jul 14, 2019
0b532fd
Remove unnecessary checks from SetupState
bluetech Jul 15, 2019
675e950
Don't accept bytes message in pytest.{fail,xfail,skip}
bluetech Jul 17, 2019
c05fcc8
Merge pull request #5615 from bluetech/type-annotations-2
asottile Jul 19, 2019
3c74389
Replace internal config._origargs with invocation_params.args
blueyed Jul 23, 2019
4abf95b
Merge pull request #5644 from blueyed/rm-_orig_args
nicoddemus Jul 23, 2019
b5b710b
Merge master into features
blueyed Aug 2, 2019
29e336b
Merge pull request #5687 from blueyed/merge-master
blueyed Aug 3, 2019
1ce45a6
Add hostname and timestamp to JUnit XML testsuite tag
samueljsb Aug 3, 2019
cf6632a
Rename 5471.trivial.rst to 5471.feature.rst
nicoddemus Aug 5, 2019
f7e925d
Add hostname and timestamp to JUnit XML testsuite tag (#5692)
nicoddemus Aug 5, 2019
aa06e6c
Merge master into features
blueyed Aug 5, 2019
f5fab2b
Merge master into features (#5698)
nicoddemus Aug 5, 2019
ba76080
Validate xunit2 files against the schema
nicoddemus Jul 12, 2019
ba72b48
Remove xfail marker from test_runs_twice_xdist
nicoddemus Jul 15, 2019
9f6da8c
Remove unused function CallSpec2.setall
blueyed Aug 9, 2019
65e6038
Validate xunit2 files against the schema (#5605)
nicoddemus Aug 9, 2019
ec76f70
Remove unused function CallSpec2.setall (#5716)
nicoddemus Aug 9, 2019
2f065a5
Merge remote-tracking branch 'upstream/master' into release-5.1.0
nicoddemus Aug 9, 2019
beb457c
Add new 'improvement' changelog category
nicoddemus Aug 10, 2019
8665f56
Merge pull request #5722 from nicoddemus/improvements-changelog
asottile Aug 10, 2019
345df99
Show session duration in human-readable format
nicoddemus Aug 10, 2019
2498aea
Merge master into features (#5717)
nicoddemus Aug 10, 2019
300f785
Show session duration in human-readable format (#5721)
nicoddemus Aug 11, 2019
cb481a3
assertrepr_compare: prefer same maxsize
blueyed Aug 12, 2019
39ba996
assertion.rewrite: use ast.NameConstant(None) directly
blueyed Aug 12, 2019
67ac878
Merge pull request #5732 from blueyed/drop-py2
bluetech Aug 12, 2019
1a61265
Publish GitHub release notes after deployment
nicoddemus Aug 10, 2019
ed24251
Merge pull request #5731 from blueyed/assert-compare-maxsize
blueyed Aug 12, 2019
a24132d
Publish GitHub release notes after deployment (#5723)
nicoddemus Aug 12, 2019
1434b66
pytester: spawn: skip without pexpect.spawn
blueyed Aug 13, 2019
fa75d81
pytester: spawn: skip without pexpect.spawn (#5736)
nicoddemus Aug 14, 2019
cb94fd3
Use TRAVIS_REPO_SLUG instead of hard-coding pytest-dev/pytest
nicoddemus Aug 14, 2019
0822a1e
Merge pull request #5740 from nicoddemus/use-repo-env-var
nicoddemus Aug 15, 2019
d7f0825
Merge remote-tracking branch 'upstream/master' into mm
nicoddemus Aug 15, 2019
1049a38
Fix wording as suggested in review of #5741
nicoddemus Aug 15, 2019
0f11a7a
Merge master into features (#5744)
nicoddemus Aug 15, 2019
409d61b
Merge remote-tracking branch 'upstream/master' into release-5.1.0
nicoddemus Aug 15, 2019
eaf7ce9
Preparing release version 5.1.0
nicoddemus Aug 16, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Here is a quick checklist that should be present in PRs.
-->

- [ ] Target the `master` branch for bug fixes, documentation updates and trivial changes.
- [ ] Target the `features` branch for new features and removals/deprecations.
- [ ] Target the `features` branch for new features, improvements, and removals/deprecations.
- [ ] Include documentation when adding new features.
- [ ] Include new tests or update existing tests when applicable.

Expand Down
11 changes: 3 additions & 8 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,10 @@ repos:
hooks:
- id: rst-backticks
- repo: https://github.com/pre-commit/mirrors-mypy
rev: v0.711
rev: v0.720
hooks:
- id: mypy
name: mypy (src)
files: ^src/
args: []
- id: mypy
name: mypy (testing)
files: ^testing/
files: ^(src/|testing/)
args: []
- repo: local
hooks:
Expand All @@ -64,7 +59,7 @@ repos:
name: changelog filenames
language: fail
entry: 'changelog files must be named ####.(feature|bugfix|doc|deprecation|removal|vendor|trivial).rst'
exclude: changelog/(\d+\.(feature|bugfix|doc|deprecation|removal|vendor|trivial).rst|README.rst|_template.rst)
exclude: changelog/(\d+\.(feature|improvement|bugfix|doc|deprecation|removal|vendor|trivial).rst|README.rst|_template.rst)
files: ^changelog/
- id: py-deprecated
name: py library is deprecated
Expand Down
11 changes: 10 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,17 @@ jobs:

- stage: deploy
python: '3.6'
install: pip install -U setuptools setuptools_scm
install: pip install -U setuptools setuptools_scm tox
script: skip
# token to upload github release notes: GH_RELEASE_NOTES_TOKEN
env:
- secure: "OjOeL7/0JUDkV00SsTs732e8vQjHynpbG9FKTNtZZJ+1Zn4Cib+hAlwmlBnvVukML0X60YpcfjnC4quDOIGLPsh5zeXnvJmYtAIIUNQXjWz8NhcGYrhyzuP1rqV22U68RTCdmOq3lMYU/W2acwHP7T49PwJtOiUM5kF120UAQ0Zi5EmkqkIvH8oM5mO9Dlver+/U7Htpz9rhKrHBXQNCMZI6yj2aUyukqB2PN2fjAlDbCF//+FmvYw9NjT4GeFOSkTCf4ER9yfqs7yglRfwiLtOCZ2qKQhWZNsSJDB89rxIRXWavJUjJKeY2EW2/NkomYJDpqJLIF4JeFRw/HhA47CYPeo6BJqyyNV+0CovL1frpWfi9UQw2cMbgFUkUIUk3F6DD59PHNIOX2R/HX56dQsw7WKl3QuHlCOkICXYg8F7Ta684IoKjeTX03/6QNOkURfDBwfGszY0FpbxrjCSWKom6RyZdyidnESaxv9RzjcIRZVh1rp8KMrwS1OrwRSdG0zjlsPr49hWMenN/8fKgcHTV4/r1Tj6mip0dorSRCrgUNIeRBKgmui6FS8642ab5JNKOxMteVPVR2sFuhjOQ0Jy+PmvceYY9ZMWc3+/B/KVh0dZ3hwvLGZep/vxDS2PwCA5/xw31714vT5LxidKo8yECjBynMU/wUTTS695D3NY="
addons:
apt:
packages:
# required by publish_gh_release_notes
- pandoc
after_deploy: tox -e publish_gh_release_notes
deploy:
provider: pypi
user: nicoddemus
Expand Down
1 change: 1 addition & 0 deletions AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ Danielle Jenkins
Dave Hunt
David Díaz-Barquero
David Mohr
David Paul Röthlisberger
David Szotten
David Vierra
Daw-Ran Liou
Expand Down
158 changes: 158 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,164 @@ with advance notice in the **Deprecations** section of releases.

.. towncrier release notes start

pytest 5.1.0 (2019-08-15)
=========================

Removals
--------

- `#5180 <https://github.com/pytest-dev/pytest/issues/5180>`_: As per our policy, the following features have been deprecated in the 4.X series and are now
removed:

* ``Request.getfuncargvalue``: use ``Request.getfixturevalue`` instead.

* ``pytest.raises`` and ``pytest.warns`` no longer support strings as the second argument.

* ``message`` parameter of ``pytest.raises``.

* ``pytest.raises``, ``pytest.warns`` and ``ParameterSet.param`` now use native keyword-only
syntax. This might change the exception message from previous versions, but they still raise
``TypeError`` on unknown keyword arguments as before.

* ``pytest.config`` global variable.

* ``tmpdir_factory.ensuretemp`` method.

* ``pytest_logwarning`` hook.

* ``RemovedInPytest4Warning`` warning type.

* ``request`` is now a reserved name for fixtures.


For more information consult
`Deprecations and Removals <https://docs.pytest.org/en/latest/deprecations.html>`__ in the docs.


- `#5565 <https://github.com/pytest-dev/pytest/issues/5565>`_: Removed unused support code for `unittest2 <https://pypi.org/project/unittest2/>`__.

The ``unittest2`` backport module is no longer
necessary since Python 3.3+, and the small amount of code in pytest to support it also doesn't seem
to be used: after removed, all tests still pass unchanged.

Although our policy is to introduce a deprecation period before removing any features or support
for third party libraries, because this code is apparently not used
at all (even if ``unittest2`` is used by a test suite executed by pytest), it was decided to
remove it in this release.

If you experience a regression because of this, please
`file an issue <https://github.com/pytest-dev/pytest/issues/new>`__.


- `#5615 <https://github.com/pytest-dev/pytest/issues/5615>`_: ``pytest.fail``, ``pytest.xfail`` and ``pytest.skip`` no longer support bytes for the message argument.

This was supported for Python 2 where it was tempting to use ``"message"``
instead of ``u"message"``.

Python 3 code is unlikely to pass ``bytes`` to these functions. If you do,
please decode it to an ``str`` beforehand.



Features
--------

- `#5564 <https://github.com/pytest-dev/pytest/issues/5564>`_: New ``Config.invocation_args`` attribute containing the unchanged arguments passed to ``pytest.main()``.


- `#5576 <https://github.com/pytest-dev/pytest/issues/5576>`_: New `NUMBER <https://docs.pytest.org/en/latest/doctest.html#using-doctest-options>`__
option for doctests to ignore irrelevant differences in floating-point numbers.
Inspired by Sébastien Boisgérault's `numtest <https://github.com/boisgera/numtest>`__
extension for doctest.



Improvements
------------

- `#5471 <https://github.com/pytest-dev/pytest/issues/5471>`_: JUnit XML now includes a timestamp and hostname in the testsuite tag.


- `#5707 <https://github.com/pytest-dev/pytest/issues/5707>`_: Time taken to run the test suite now includes a human-readable representation when it takes over
60 seconds, for example::

===== 2 failed in 102.70s (0:01:42) =====



Bug Fixes
---------

- `#4344 <https://github.com/pytest-dev/pytest/issues/4344>`_: Fix RuntimeError/StopIteration when trying to collect package with "__init__.py" only.


- `#5115 <https://github.com/pytest-dev/pytest/issues/5115>`_: Warnings issued during ``pytest_configure`` are explicitly not treated as errors, even if configured as such, because it otherwise completely breaks pytest.


- `#5477 <https://github.com/pytest-dev/pytest/issues/5477>`_: The XML file produced by ``--junitxml`` now correctly contain a ``<testsuites>`` root element.


- `#5523 <https://github.com/pytest-dev/pytest/issues/5523>`_: Fixed using multiple short options together in the command-line (for example ``-vs``) in Python 3.8+.


- `#5524 <https://github.com/pytest-dev/pytest/issues/5524>`_: Fix issue where ``tmp_path`` and ``tmpdir`` would not remove directories containing files marked as read-only,
which could lead to pytest crashing when executed a second time with the ``--basetemp`` option.


- `#5537 <https://github.com/pytest-dev/pytest/issues/5537>`_: Replace ``importlib_metadata`` backport with ``importlib.metadata`` from the
standard library on Python 3.8+.


- `#5578 <https://github.com/pytest-dev/pytest/issues/5578>`_: Improve type checking for some exception-raising functions (``pytest.xfail``, ``pytest.skip``, etc)
so they provide better error messages when users meant to use marks (for example ``@pytest.xfail``
instead of ``@pytest.mark.xfail``).


- `#5606 <https://github.com/pytest-dev/pytest/issues/5606>`_: Fixed internal error when test functions were patched with objects that cannot be compared
for truth values against others, like ``numpy`` arrays.


- `#5634 <https://github.com/pytest-dev/pytest/issues/5634>`_: ``pytest.exit`` is now correctly handled in ``unittest`` cases.
This makes ``unittest`` cases handle ``quit`` from pytest's pdb correctly.


- `#5650 <https://github.com/pytest-dev/pytest/issues/5650>`_: Improved output when parsing an ini configuration file fails.


- `#5701 <https://github.com/pytest-dev/pytest/issues/5701>`_: Fix collection of ``staticmethod`` objects defined with ``functools.partial``.


- `#5734 <https://github.com/pytest-dev/pytest/issues/5734>`_: Skip async generator test functions, and update the warning message to refer to ``async def`` functions.



Improved Documentation
----------------------

- `#5669 <https://github.com/pytest-dev/pytest/issues/5669>`_: Add docstring for ``Testdir.copy_example``.



Trivial/Internal Changes
------------------------

- `#5095 <https://github.com/pytest-dev/pytest/issues/5095>`_: XML files of the ``xunit2`` family are now validated against the schema by pytest's own test suite
to avoid future regressions.


- `#5516 <https://github.com/pytest-dev/pytest/issues/5516>`_: Cache node splitting function which can improve collection performance in very large test suites.


- `#5603 <https://github.com/pytest-dev/pytest/issues/5603>`_: Simplified internal ``SafeRepr`` class and removed some dead code.


- `#5664 <https://github.com/pytest-dev/pytest/issues/5664>`_: When invoking pytest's own testsuite with ``PYTHONDONTWRITEBYTECODE=1``,
the ``test_xfail_handling`` test no longer fails.


- `#5684 <https://github.com/pytest-dev/pytest/issues/5684>`_: Replace manual handling of ``OSError.errno`` in the codebase by new ``OSError`` subclasses (``PermissionError``, ``FileNotFoundError``, etc.).


pytest 5.0.1 (2019-07-04)
=========================

Expand Down
1 change: 0 additions & 1 deletion changelog/4344.bugfix.rst

This file was deleted.

1 change: 0 additions & 1 deletion changelog/5115.bugfix.rst

This file was deleted.

1 change: 0 additions & 1 deletion changelog/5516.trivial.rst

This file was deleted.

2 changes: 0 additions & 2 deletions changelog/5524.bugfix.rst

This file was deleted.

3 changes: 0 additions & 3 deletions changelog/5578.bugfix.rst

This file was deleted.

2 changes: 0 additions & 2 deletions changelog/5606.bugfix.rst

This file was deleted.

2 changes: 0 additions & 2 deletions changelog/5634.bugfix.rst

This file was deleted.

1 change: 0 additions & 1 deletion changelog/5650.bugfix.rst

This file was deleted.

2 changes: 0 additions & 2 deletions changelog/5664.trivial.rst

This file was deleted.

1 change: 0 additions & 1 deletion changelog/5669.doc.rst

This file was deleted.

1 change: 0 additions & 1 deletion changelog/5684.trivial.rst

This file was deleted.

1 change: 0 additions & 1 deletion changelog/5701.bugfix.rst

This file was deleted.

1 change: 0 additions & 1 deletion changelog/5734.bugfix.rst

This file was deleted.

1 change: 1 addition & 0 deletions changelog/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ Each file should be named like ``<ISSUE>.<TYPE>.rst``, where
``<ISSUE>`` is an issue number, and ``<TYPE>`` is one of:

* ``feature``: new user facing features, like new command-line options and new behavior.
* ``improvement``: improvement of existing functionality, usually without requiring user intervention (for example, new fields being written in ``--junitxml``, improved colors in terminal, etc).
* ``bugfix``: fixes a reported bug.
* ``doc``: documentation improvement, like rewording an entire session or adding missing docs.
* ``deprecation``: feature deprecation.
Expand Down
1 change: 1 addition & 0 deletions doc/en/announce/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ Release announcements
:maxdepth: 2


release-5.1.0
release-5.0.1
release-5.0.0
release-4.6.5
Expand Down
56 changes: 56 additions & 0 deletions doc/en/announce/release-5.1.0.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
pytest-5.1.0
=======================================

The pytest team is proud to announce the 5.1.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:

https://docs.pytest.org/en/latest/changelog.html

For complete documentation, please visit:

https://docs.pytest.org/en/latest/

As usual, you can upgrade from pypi via:

pip install -U pytest

Thanks to all who contributed to this release, among them:

* Albert Tugushev
* Alexey Zankevich
* Anthony Sottile
* Bruno Oliveira
* Daniel Hahler
* David Röthlisberger
* Florian Bruhin
* Ilya Stepin
* Jon Dufresne
* Kaiqi
* Max R
* Miro Hrončok
* Oliver Bestwalter
* Ran Benita
* Ronny Pfannschmidt
* Samuel Searles-Bryant
* Semen Zhydenko
* Steffen Schroeder
* Thomas Grainger
* Tim Hoffmann
* William Woodall
* Wojtek Erbetowski
* Xixi Zhao
* Yash Todi
* boris
* dmitry.dygalo
* helloocc
* martbln
* mei-li


Happy testing,
The Pytest Development Team
6 changes: 3 additions & 3 deletions doc/en/assert.rst
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ you will see the return value of the function call:
E + where 3 = f()

test_assert1.py:6: AssertionError
========================= 1 failed in 0.12 seconds =========================
============================ 1 failed in 0.05s =============================

``pytest`` has support for showing the values of the most common subexpressions
including calls, attributes, comparisons, and binary and unary
Expand Down Expand Up @@ -208,7 +208,7 @@ if you run this module:
E Use -v to get the full diff

test_assert2.py:6: AssertionError
========================= 1 failed in 0.12 seconds =========================
============================ 1 failed in 0.05s =============================

Special comparisons are done for a number of cases:

Expand Down Expand Up @@ -279,7 +279,7 @@ the conftest file:
E vals: 1 != 2

test_foocompare.py:12: AssertionError
1 failed in 0.12 seconds
1 failed in 0.05s

.. _assert-details:
.. _`assert introspection`:
Expand Down
2 changes: 1 addition & 1 deletion doc/en/builtin.rst
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ For information about fixtures, see :ref:`fixtures`. To see a complete list of a
in python < 3.6 this is a pathlib2.Path


no tests ran in 0.12 seconds
no tests ran in 0.01s

You can also interactively ask for help, e.g. by typing on the Python interactive prompt something like:

Expand Down
Loading