Florian Dahlitz
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								62d3577435 
								
							 
						 
						
							
							
								
								Add note about --strict and --strict-markers to references  
							
							 
							
							
							
						 
						
							2020-05-22 16:33:50 +02:00  
						
					 
				
					
						
							
							
								 
								Nikolay Kondratyev
							
						 
						
							 
							
							
							
							
								
							
							
								285beddf28 
								
							 
						 
						
							
							
								
								Fix documentation typo  
							
							 
							
							
							
						 
						
							2020-03-29 16:55:56 +03:00  
						
					 
				
					
						
							
							
								 
								Tim Hoffmann
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								0e4a44db3b 
								
							 
						 
						
							
							
								
								Better document xfail(condition) ( #6957 )  
							
							 
							
							
							
						 
						
							2020-03-27 22:46:42 +03:00  
						
					 
				
					
						
							
							
								 
								Daniel Hahler
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								aae0579bcd 
								
							 
						 
						
							
							
								
								doc: use `envvar` directive for environment variables ( #6874 )  
							
							 
							
							... 
							
							
							
							This changes the link anchors in "reference.html", from e.g.
`reference.html#pytest-current-test` to
`reference.html#envvar-PYTEST_CURRENT_TEST`, but I think that is OK, and
not worth adding labels for the old anchors. 
							
						 
						
							2020-03-27 02:40:25 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Hahler
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								327ec54248 
								
							 
						 
						
							
							
								
								Doc fixes ( #6861 )  
							
							 
							
							
							
						 
						
							2020-03-27 02:22:03 +01:00  
						
					 
				
					
						
							
							
								 
								Danny Sepler
							
						 
						
							 
							
							
							
							
								
							
							
								2d897ad39f 
								
							 
						 
						
							
							
								
								Fix reference to the cache fixture  
							
							 
							
							
							
						 
						
							2020-03-14 20:12:52 -04:00  
						
					 
				
					
						
							
							
								 
								Tobias Schmidt
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								90ee8a7599 
								
							 
						 
						
							
							
								
								docfix  
							
							 
							
							
							
						 
						
							2020-03-12 09:38:00 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Hahler
							
						 
						
							 
							
							
							
							
								
							
							
								3865f77de3 
								
							 
						 
						
							
							
								
								doc: TestReport: :show-inheritance:  
							
							 
							
							
							
						 
						
							2020-03-05 06:00:11 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Hahler
							
						 
						
							 
							
							
							
							
								
							
							
								a1ad6e3117 
								
							 
						 
						
							
							
								
								doc: fix/revisit _Result (hook wrappers)  
							
							 
							
							... 
							
							
							
							- it should not document the deprecated `result`; used the same as
  pluggy documents itself
- add a "hookwrapper" label, that could be used by pluggy (currently it
  links to the section)
- use pluggy's `hookwrappers` label for linking to its documentation 
							
						 
						
							2020-03-05 05:55:04 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Hahler
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								2e48c32dea 
								
							 
						 
						
							
							
								
								docs: fix reference to config.cache fixture ( #6807 )  
							
							 
							
							
							
						 
						
							2020-02-26 01:24:18 +01:00  
						
					 
				
					
						
							
							
								 
								kpinc
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								eeebcd77dd 
								
							 
						 
						
							
							
								
								doc: add list of fixtures to start of fixture chapter ( #6696 )  
							
							 
							
							... 
							
							
							
							- Add list of fixtures to start of fixture chapter
- Add "fixture" cross ref type 
							
						 
						
							2020-02-22 14:56:19 +01:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								78baa7b575 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into mm  
							
							 
							
							... 
							
							
							
							Conflicts:
	src/_pytest/main.py
	src/_pytest/mark/structures.py
	src/_pytest/python.py
	testing/test_main.py
	testing/test_parseopt.py 
							
						 
						
							2020-02-11 19:22:28 -03:00  
						
					 
				
					
						
							
							
								 
								Ran Benita
							
						 
						
							 
							
							
							
							
								
							
							
								d33da078a8 
								
							 
						 
						
							
							
								
								Move ExitCode's definition from _pytest.main to _pytest.config  
							
							 
							
							... 
							
							
							
							ExitCode is used in several internal modules and hooks and so with type
annotations added, needs to be imported a lot.
_pytest.main, being the entry point, generally sits at the top of the
import tree.
So, it's not great to have ExitCode defined in _pytest.main, because it
will cause a lot of import cycles once type annotations are added (in
fact there is already one, which this change removes).
Move it to _pytest.config instead.
_pytest.main still imports ExitCode, so importing from there still
works, although external users should really be importing from `pytest`. 
							
						 
						
							2020-02-10 23:55:06 +02:00  
						
					 
				
					
						
							
							
								 
								rebecca-palmer
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								c55bf23cbe 
								
							 
						 
						
							
							
								
								doc: s/pytest_mark/pytestmark ( #6661 )  
							
							 
							
							
							
						 
						
							2020-02-03 08:56:37 +01:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								9298f7e4a9 
								
							 
						 
						
							
							
								
								Improve CHANGELOG and docs for junit_logging  
							
							 
							
							
							
						 
						
							2020-01-16 07:47:00 -03:00  
						
					 
				
					
						
							
							
								 
								Jakub Mitoraj
							
						 
						
							 
							
							
							
							
								
							
							
								ab6406b42e 
								
							 
						 
						
							
							
								
								Update junit_logging with no,log,system-out,system-err,out-err,all  
							
							 
							
							
							
						 
						
							2020-01-16 08:14:46 +01:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								23475b6ab9 
								
							 
						 
						
							
							
								
								Fix wrong 'changelog' and 'reference' links in docs  
							
							 
							
							... 
							
							
							
							Both references were referencing links from Python because of our intersphinx
mapping in `conf.py`:
    intersphinx_mapping = {"python": ("https://docs.python.org/3 ", None)}
Because Python's docs explicitly define both references, Sphinx fallbacks to
them instead of generating implicit references as was expected.
Fix  #6397  
							
						 
						
							2020-01-09 18:06:15 -03:00  
						
					 
				
					
						
							
							
								 
								Jared Vasquez
							
						 
						
							 
							
							
							
							
								
							
							
								c00a43a17d 
								
							 
						 
						
							
							
								
								fix typo  
							
							 
							
							
							
						 
						
							2019-12-02 22:29:22 -08:00  
						
					 
				
					
						
							
							
								 
								Daniel Hahler
							
						 
						
							 
							
							
							
							
								
							
							
								d3ab56f531 
								
							 
						 
						
							
							
								
								docs: move changelog to docs/en and allow sphinx directives  
							
							 
							
							... 
							
							
							
							Now `tox -e docs` will also include the draft changelog for the
next version (locally only).
`CHANGELOG.rst` now only points to the changelog on READTHEDOCS so
sphinx diretives can be used.
Followup to https://github.com/pytest-dev/pytest/pull/6272  
							
						 
						
							2019-11-28 21:23:58 -03:00  
						
					 
				
					
						
							
							
								 
								Daniel Hahler
							
						 
						
							 
							
							
							
							
								
							
							
								b9dd0e6210 
								
							 
						 
						
							
							
								
								docs: add missing `log_cli` confval  
							
							 
							
							
							
						 
						
							2019-11-24 22:34:15 +01:00  
						
					 
				
					
						
							
							
								 
								Anthony Sottile
							
						 
						
							 
							
							
							
							
								
							
							
								cc78444c30 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into mm  
							
							 
							
							
							
						 
						
							2019-11-15 15:26:57 -08:00  
						
					 
				
					
						
							
							
								 
								Brett Cannon
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								0b40749c98 
								
							 
						 
						
							
							
								
								Delineate syntactically that the 'match' argument to 'raises' is keyword-only  
							
							 
							
							
							
						 
						
							2019-11-12 12:32:05 -08:00  
						
					 
				
					
						
							
							
								 
								Michael Krebs
							
						 
						
							 
							
							
							
							
								
							
							
								1f5b454355 
								
							 
						 
						
							
							
								
								Add log-auto-indent option to control multiline formatting  
							
							 
							
							
							
						 
						
							2019-10-25 11:31:33 -04:00  
						
					 
				
					
						
							
							
								 
								Kevin J. Foley
							
						 
						
							 
							
							
							
							
								
							
							
								b490f5f979 
								
							 
						 
						
							
							
								
								Fix doc typo  
							
							 
							
							
							
						 
						
							2019-10-01 10:17:26 -04:00  
						
					 
				
					
						
							
							
								 
								Gene Wood
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								f0d538329c 
								
							 
						 
						
							
							
								
								Update doc regarding pytest.raises  
							
							 
							
							... 
							
							
							
							Remove reference to the `message` argument in the docs as it was deprecated in #4539  
							
						 
						
							2019-09-09 12:14:09 -07:00  
						
					 
				
					
						
							
							
								 
								Tim Hoffmann
							
						 
						
							 
							
							
							
							
								
							
							
								b095e0de47 
								
							 
						 
						
							
							
								
								Improve docs of pytest.importorskip  
							
							 
							
							
							
						 
						
							2019-08-09 21:35:03 +02:00  
						
					 
				
					
						
							
							
								 
								boris
							
						 
						
							 
							
							
							
							
								
							
							
								78de9d4677 
								
							 
						 
						
							
							
								
								replace implicit code tag with colon .replace("::\n\n.. code-block", ":\n\n.. code-block")  
							
							 
							
							
							
						 
						
							2019-08-06 16:20:06 -07:00  
						
					 
				
					
						
							
							
								 
								boris
							
						 
						
							 
							
							
							
							
								
							
							
								23a0b532db 
								
							 
						 
						
							
							
								
								Revert "remove implicit code tags .replace("::\n\n.. code-block", "\n\n.. code-block")"  
							
							 
							
							... 
							
							
							
							This reverts commit 9fce0bdd88 . 
							
						 
						
							2019-08-06 16:18:06 -07:00  
						
					 
				
					
						
							
							
								 
								boris
							
						 
						
							 
							
							
							
							
								
							
							
								9fce0bdd88 
								
							 
						 
						
							
							
								
								remove implicit code tags .replace("::\n\n.. code-block", "\n\n.. code-block")  
							
							 
							
							
							
						 
						
							2019-08-06 15:46:57 -07:00  
						
					 
				
					
						
							
							
								 
								boris
							
						 
						
							 
							
							
							
							
								
							
							
								5f95dce956 
								
							 
						 
						
							
							
								
								ran blacken-docs  
							
							 
							
							
							
						 
						
							2019-08-06 13:34:58 -07:00  
						
					 
				
					
						
							
							
								 
								boris
							
						 
						
							 
							
							
							
							
								
							
							
								7f90e74e02 
								
							 
						 
						
							
							
								
								label code blocks  
							
							 
							
							
							
						 
						
							2019-08-06 13:25:54 -07:00  
						
					 
				
					
						
							
							
								 
								Tim Hoffmann
							
						 
						
							 
							
							
							
							
								
							
							
								bb7608c56f 
								
							 
						 
						
							
							
								
								Change section titles in docs  
							
							 
							
							
							
						 
						
							2019-07-15 16:25:33 +02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								3afee36ebb 
								
							 
						 
						
							
							
								
								Improve docs and reference  
							
							 
							
							
							
						 
						
							2019-06-26 19:15:00 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								3f5b078462 
								
							 
						 
						
							
							
								
								Merge pull request  #5441  from nicoddemus/faulthandler-5440  
							
							 
							
							... 
							
							
							
							Integrate pytest-faulthandler into the core 
							
						 
						
							2019-06-24 20:01:15 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								3ce31b6370 
								
							 
						 
						
							
							
								
								Change pytest-faulthandler for simplification  
							
							 
							
							... 
							
							
							
							* The --no-faulthandler option is not necessary given that we can use
  `-p no:faulthandler`.
* The `--faulthandler-timeout` command-line option has become an ini
  option, for the reasons described in
  https://github.com/pytest-dev/pytest-faulthandler/issues/34  and
  users can still set it from the command-line.
Fix  pytest-dev/pytest-faulthandler#34  
							
						 
						
							2019-06-22 19:22:43 -03:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								103d6146b0 
								
							 
						 
						
							
							
								
								document exitcode members  
							
							 
							
							
							
						 
						
							2019-06-15 17:18:21 +02:00  
						
					 
				
					
						
							
							
								 
								Pulkit Goyal
							
						 
						
							 
							
							
							
							
								
							
							
								1d6bbab2b0 
								
							 
						 
						
							
							
								
								Add a new Exceptions section in documentation and document UsageError  
							
							 
							
							
							
						 
						
							2019-06-03 14:23:56 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								f9cafd1c94 
								
							 
						 
						
							
							
								
								Add missing junitxml ini options to the reference docs  
							
							 
							
							
							
						 
						
							2019-05-29 21:13:16 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								7e8044f9b8 
								
							 
						 
						
							
							
								
								Revamp the mark section in the docs  
							
							 
							
							... 
							
							
							
							Add an introductory section about how to register marks,
including doing so programatically (#5255 ). 
							
						 
						
							2019-05-15 20:45:22 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								465b2d998a 
								
							 
						 
						
							
							
								
								Further "unknown marks warning" improvements ( #5178 )  
							
							 
							
							... 
							
							
							
							Further "unknown marks warning" improvements 
							
						 
						
							2019-05-11 13:28:10 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								73bbff2b74 
								
							 
						 
						
							
							
								
								Introduce record_testsuite_property fixture  
							
							 
							
							... 
							
							
							
							This exposes the functionality introduced in fa6acdc  as a session-scoped fixture.
Plugins that want to remain compatible with the `xunit2`
standard should use this fixture instead of `record_property`.
Fix  #5202  
							
						 
						
							2019-05-10 19:44:27 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								0594dba5ce 
								
							 
						 
						
							
							
								
								Remove unused markers and enable --strict-markers  
							
							 
							
							
							
						 
						
							2019-05-09 19:36:39 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								685ca96c71 
								
							 
						 
						
							
							
								
								Change ``--strict`` to ``--strict-markers``, preserving the old one  
							
							 
							
							... 
							
							
							
							Fix  #5023  
							
						 
						
							2019-05-09 19:36:38 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								9c5da9c0d1 
								
							 
						 
						
							
							
								
								Remove all version references to obsolete pytest versions  
							
							 
							
							... 
							
							
							
							Remove version references to pytest 2 and 3.
Just like Python 3 no longer has references to Python 2, I think
we should follow the same approach in pytest. 
							
						 
						
							2019-04-28 12:37:58 -03:00  
						
					 
				
					
						
							
							
								 
								Daniel Hahler
							
						 
						
							 
							
							
							
							
								
							
							
								e1ae469504 
								
							 
						 
						
							
							
								
								Merge master into features  
							
							 
							
							
							
						 
						
							2019-03-26 10:23:21 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Hahler
							
						 
						
							 
							
							
							
							
								
							
							
								8e125c9759 
								
							 
						 
						
							
							
								
								doc/en/reference.rst: whitespace/alignment  
							
							 
							
							
							
						 
						
							2019-03-22 13:23:44 +01:00  
						
					 
				
					
						
							
							
								 
								Brian Skinn
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								dcbdcc729b 
								
							 
						 
						
							
							
								
								Fix pytestmark syntax in reference.rst  
							
							 
							
							... 
							
							
							
							pytest 4.3.1 throws an error if `pytestmark` is set to a tuple of marks; it appears to insist on a list.
With `pytestmark = [pytest.mark.api, pytest.mark.good]`:
```
============================== test session starts ==============================
platform win32 -- Python 3.6.3, pytest-4.3.1, py-1.8.0, pluggy-0.9.0
rootdir: C:\Temp\git\sphobjinv, inifile: tox.ini
plugins: timeout-1.3.3
collected 48 items / 41 deselected / 7 selected
tests\test_api_good.py .......                                             [100%]
==================== 7 passed, 41 deselected in 0.15 seconds ====================
```
With `pytestmark = (pytest.mark.api, pytest.mark.good)`:
```
==================================== ERRORS =====================================
____________________ ERROR collecting tests/test_api_good.py ____________________
env\lib\site-packages\_pytest\runner.py:226: in from_call
    result = func()
env\lib\site-packages\_pytest\runner.py:289: in <lambda>
    call = CallInfo.from_call(lambda: list(collector.collect()), "collect")
env\lib\site-packages\_pytest\python.py:435: in collect
    self._inject_setup_module_fixture()
env\lib\site-packages\_pytest\python.py:447: in _inject_setup_module_fixture
    setup_module = _get_non_fixture_func(self.obj, "setUpModule")
env\lib\site-packages\_pytest\python.py:255: in obj
    self.own_markers.extend(get_unpacked_marks(self.obj))
env\lib\site-packages\_pytest\mark\structures.py:244: in get_unpacked_marks
    return normalize_mark_list(mark_list)
env\lib\site-packages\_pytest\mark\structures.py:259: in normalize_mark_list
    raise TypeError("got {!r} instead of Mark".format(mark))
E   TypeError: got (MarkDecorator(mark=Mark(name='api', args=(), kwargs={})), MarkDecorator(mark=Mark(name='good', args=(), kwargs={}))) instead of Mark
!!!!!!!!!!!!!!!!!!!! Interrupted: 1 errors during collection !!!!!!!!!!!!!!!!!!!!
==================== 19 deselected, 1 error in 0.27 seconds =====================
``` 
							
						 
						
							2019-03-21 15:14:28 -04:00  
						
					 
				
					
						
							
							
								 
								smheidrich
							
						 
						
							 
							
							
							
							
								
							
							
								519157cfcf 
								
							 
						 
						
							
							
								
								Minor grammar fixes in pytest.mark.xfail docs  
							
							 
							
							
							
						 
						
							2019-03-17 10:14:40 +01:00  
						
					 
				
					
						
							
							
								 
								Kyle Altendorf
							
						 
						
							 
							
							
							
							
								
							
							
								2d43f42769 
								
							 
						 
						
							
							
								
								Add missing plugin hooks to docs  
							
							 
							
							... 
							
							
							
							pytest-dev/pytest#4896  
							
						 
						
							2019-03-08 09:24:01 -05:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								dac164cc99 
								
							 
						 
						
							
							
								
								Add missing ref docs to tmp_path and tmp_path_factory  
							
							 
							
							
							
						 
						
							2019-03-01 17:09:07 -03:00