Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 doc/en/example/nonpython.rst
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ consulted when reporting in ``verbose`` mode. It should return a tuple
``(path, lineno, description)``, where:

* ``path`` is the path shown in reports (usually ``self.path`` or ``self.fspath``).
* ``lineno`` is a zero-based line number, or ``0`` when no specific line applies.
* ``lineno`` is the line number, or ``0`` when no specific line applies.
* ``description`` is a short label shown for the collected item:

.. code-block:: pytest
Expand Down
4 changes: 0 additions & 4 deletions doc/en/how-to/assert.rst
Original file line number Diff line number Diff line change
Expand Up @@ -432,10 +432,6 @@ Special comparisons are done for a number of cases:
* comparing long sequences: first failing indices
* comparing dicts: different entries

In string context diffs, lines prefixed with ``-`` come from the left-hand side
of ``assert left == right``, while lines prefixed with ``+`` come from the
right-hand side.

See the :ref:`reporting demo <tbreportdemo>` for many more examples.

Defining your own explanation for failed assertions
Expand Down
2 changes: 1 addition & 1 deletion doc/en/reference/customize.rst
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ pyproject.toml
]

For projects that still run pytest versions older than 6.0, keep
``minversion`` in ``pytest.ini`` or ``setup.cfg`` too. Those versions
``minversion`` in ``pytest.ini`` or ``tox.ini`` too. Those versions
do not read ``pyproject.toml``.

tox.ini
Expand Down
Loading