8b2fcf517c 
								
							 
						 
						
							
							
								
								Merge master  
							
							
							
						 
						
							2019-04-11 13:28:36 +02:00  
				
					
						
							
							
								 
						
							
								8011ff5bda 
								
							 
						 
						
							
							
								
								Add _sys_snapshot fixture and use it with more tests  
							
							
							
						 
						
							2019-04-05 11:55:23 +02:00  
				
					
						
							
							
								 
						
							
								8c734dfc2f 
								
							 
						 
						
							
							
								
								Split out list of essential plugins  
							
							... 
							
							
							
							Fixes https://github.com/pytest-dev/pytest/issues/4976 . 
							
						 
						
							2019-04-02 14:39:56 +02:00  
				
					
						
							
							
								 
						
							
								e7ade066b6 
								
							 
						 
						
							
							
								
								Merge pull request  #5011  from blueyed/merge-master-into-features  
							
							... 
							
							
							
							Merge master into features 
							
						 
						
							2019-03-29 18:35:13 +01:00  
				
					
						
							
							
								 
						
							
								4e931b258d 
								
							 
						 
						
							
							
								
								Merge master into features  
							
							
							
						 
						
							2019-03-29 11:05:46 +01:00  
				
					
						
							
							
								 
						
							
								bfda2a0050 
								
							 
						 
						
							
							
								
								setup.cfg: use existing [tool:pytest] (ignoring [pytest])  
							
							
							
						 
						
							2019-03-29 10:59:27 +01:00  
				
					
						
							
							
								 
						
							
								d17ea7a9c0 
								
							 
						 
						
							
							
								
								tests: ensure cleanup with configs via get_config()  
							
							... 
							
							
							
							Also done in test_pluginmanager, although no resource warnings are
there at least.
Fixes https://github.com/pytest-dev/pytest/issues/4355 . 
							
						 
						
							2019-03-28 00:14:13 +01:00  
				
					
						
							
							
								 
						
							
								08f3b02dfc 
								
							 
						 
						
							
							
								
								tests: fnmatch_lines: use list  
							
							... 
							
							
							
							For strings fnmatch_lines converts it into a Source objects, splitted on
newlines.  This is not necessary here, and it is more consistent to use
lists here in the first place. 
							
						 
						
							2019-03-23 11:36:18 +01:00  
				
					
						
							
							
								 
						
							
								553951c443 
								
							 
						 
						
							
							
								
								Fix some issues related to "-p no:X" with default_plugins  
							
							
							
						 
						
							2019-03-21 17:01:50 +01:00  
				
					
						
							
							
								 
						
							
								c7c120fba6 
								
							 
						 
						
							
							
								
								terminal: handle "capture" option not being available  
							
							... 
							
							
							
							This is the case with `-p no:capture` now. 
							
						 
						
							2019-03-20 03:01:26 +01:00  
				
					
						
							
							
								 
						
							
								415899d428 
								
							 
						 
						
							
							
								
								config: handle `-p no:plugin` with default plugins  
							
							... 
							
							
							
							`-p no:capture` should not load its fixtures in the first place. 
							
						 
						
							2019-03-20 02:47:13 +01:00  
				
					
						
							
							
								 
						
							
								0deb7b1696 
								
							 
						 
						
							
							
								
								Do not show "inifile:" string if there's no configuration file  
							
							
							
						 
						
							2019-03-02 11:45:08 -03:00  
				
					
						
							
							
								 
						
							
								a0207274f4 
								
							 
						 
						
							
							
								
								-p option now can be used to early-load plugins by entry-point name  
							
							... 
							
							
							
							Fixes  #4718  
						
							2019-02-24 13:20:17 -03:00  
				
					
						
							
							
								 
						
							
								a68f4fd2b9 
								
							 
						 
						
							
							
								
								Fix test failures after pluggy 1.8 release  
							
							... 
							
							
							
							pluggy now calls iter_entry_points with different arguments, and tests
which mocked that call need to be updated accordingly. 
							
						 
						
							2019-02-22 18:58:54 -03:00  
				
					
						
							
							
								 
						
							
								f13935da53 
								
							 
						 
						
							
							
								
								Display --help/--version with ArgumentErrors  
							
							
							
						 
						
							2019-02-11 15:49:48 +01:00  
				
					
						
							
							
								 
						
							
								b7e8171cf8 
								
							 
						 
						
							
							
								
								Merge branch 'features' into remove-legacy-warn  
							
							
							
						 
						
							2018-12-17 10:37:31 -02:00  
				
					
						
							
							
								 
						
							
								8e287c5c77 
								
							 
						 
						
							
							
								
								Merge master into features  
							
							
							
						 
						
							2018-12-14 16:44:43 +01:00  
				
					
						
							
							
								 
						
							
								fd48cd57f9 
								
							 
						 
						
							
							
								
								Remove config.warn, Node.warn; pytest_logwarning issues a warning when implemented  
							
							... 
							
							
							
							Fix  #3078  
						
							2018-12-14 12:50:18 -02:00  
				
					
						
							
							
								 
						
							
								6af674a3ac 
								
							 
						 
						
							
							
								
								Merge pull request  #4520  from blueyed/PYTEST_DISABLE_PLUGIN_AUTOLOAD-del  
							
							... 
							
							
							
							tests: fix tests that require PYTEST_DISABLE_PLUGIN_AUTOLOAD to be unset 
							
						 
						
							2018-12-12 18:40:46 +01:00  
				
					
						
							
							
								 
						
							
								0db5ccb0dd 
								
							 
						 
						
							
							
								
								Merge master into features  
							
							
							
						 
						
							2018-12-10 05:42:07 +01:00  
				
					
						
							
							
								 
						
							
								f3babf13ea 
								
							 
						 
						
							
							
								
								Ensure that PYTEST_ADDOPTS are valid by themselves  
							
							... 
							
							
							
							Fixes https://github.com/pytest-dev/pytest/issues/4265 . 
							
						 
						
							2018-12-09 21:57:10 +01:00  
				
					
						
							
							
								 
						
							
								64ee1ee81b 
								
							 
						 
						
							
							
								
								tests: fix tests that require PYTEST_DISABLE_PLUGIN_AUTOLOAD to be unset  
							
							... 
							
							
							
							Fix pytest's own tests with PYTEST_DISABLE_PLUGIN_AUTOLOAD=1. 
							
						 
						
							2018-12-09 12:06:18 +01:00  
				
					
						
							
							
								 
						
							
								1bba0a9714 
								
							 
						 
						
							
							
								
								Deprecate `raises(..., 'code(as_a_string)')` / `warns(..., 'code(as_a_string)')  
							
							
							
						 
						
							2018-11-29 09:34:51 -08:00  
				
					
						
							
							
								 
						
							
								dc20dedbc7 
								
							 
						 
						
							
							
								
								Change RemovedInPytest4Warnings to errors by default  
							
							... 
							
							
							
							To keep existing tests which emit RemovedInPytest4Warnings running, decided
to go with a command line option because:
* Is harder to integrate an ini option with tests which already use an ini file
* It also marks tests which need to be removed/updated in 4.1, when
  RemovedInPytest4Warning and related functionality are removed.
Fix  #3737  
							
						 
						
							2018-11-12 16:10:57 -02:00  
				
					
						
							
							
								 
						
							
								4a74d455de 
								
							 
						 
						
							
							
								
								minor: typos  
							
							
							
						 
						
							2018-11-09 02:03:44 +01:00  
				
					
						
							
							
								 
						
							
								2368fbb63c 
								
							 
						 
						
							
							
								
								Apply reorder-python-imports to all files  
							
							
							
						 
						
							2018-10-25 00:01:29 -07:00  
				
					
						
							
							
								 
						
							
								b7560a8808 
								
							 
						 
						
							
							
								
								Keep backward compatibility for code as kw in Node.warn  
							
							
							
						 
						
							2018-09-04 16:48:21 -03:00  
				
					
						
							
							
								 
						
							
								47bf58d69e 
								
							 
						 
						
							
							
								
								Make Node.warn support two forms, new and deprecated  
							
							... 
							
							
							
							As suggested during review, it now accepts two forms:
Node.warn(warning_instance)  (recommended)
Node.warn(code, message)  (deprecated) 
							
						 
						
							2018-09-04 15:53:17 -03:00  
				
					
						
							
							
								 
						
							
								78ac7d99f5 
								
							 
						 
						
							
							
								
								Deprecate Config.warn and Node.warn, replaced by standard warnings  
							
							
							
						 
						
							2018-09-04 11:35:34 -03:00  
				
					
						
							
							
								 
						
							
								2f2d5861bb 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into merge-master-into-features  
							
							
							
						 
						
							2018-08-26 16:45:00 -03:00  
				
					
						
							
							
								 
						
							
								85482d575e 
								
							 
						 
						
							
							
								
								Replace Source with dedent where possible  
							
							
							
						 
						
							2018-08-23 09:06:17 -07:00  
				
					
						
							
							
								 
						
							
								c64a8c9c7f 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into merge-master-into-features  
							
							
							
						 
						
							2018-08-18 15:54:53 -03:00  
				
					
						
							
							
								 
						
							
								126896f69d 
								
							 
						 
						
							
							
								
								Add option to disable plugin auto-loading  
							
							... 
							
							
							
							If `PYTEST_DISABLE_PLUGIN_AUTOLOAD` is set, disable auto-loading of
plugins through setuptools entrypoints. Only plugins that have been
explicitly specified are loaded.
ref #3784 . 
							
						 
						
							2018-08-07 13:16:28 -04:00  
				
					
						
							
							
								 
						
							
								2c0d2eef40 
								
							 
						 
						
							
							
								
								Only consider actual functions when considering hooks  
							
							... 
							
							
							
							Fix  #3775  
						
							2018-08-04 16:37:07 -03:00  
				
					
						
							
							
								 
						
							
								cbaa7dd56a 
								
							 
						 
						
							
							
								
								Upgrade pre-commit hooks except pyupgrade  
							
							
							
						 
						
							2018-06-26 06:35:27 -07:00  
				
					
						
							
							
								 
						
							
								464117b472 
								
							 
						 
						
							
							
								
								fix imports in tests  
							
							
							
						 
						
							2018-06-05 10:20:36 +02:00  
				
					
						
							
							
								 
						
							
								703e4b11ba 
								
							 
						 
						
							
							
								
								run black  
							
							
							
						 
						
							2018-05-23 16:48:46 +02:00  
				
					
						
							
							
								 
						
							
								9aacb4635e 
								
							 
						 
						
							
							
								
								run pyupgrade  
							
							
							
						 
						
							2018-05-23 16:45:09 +02:00  
				
					
						
							
							
								 
						
							
								409b919fc0 
								
							 
						 
						
							
							
								
								#3260  Added test  
							
							
							
						 
						
							2018-02-27 19:16:45 +03:00  
				
					
						
							
							
								 
						
							
								aff463a3c4 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into features  
							
							
							
						 
						
							2018-01-27 12:28:43 -02:00  
				
					
						
							
							
								 
						
							
								3f5e9ea71e 
								
							 
						 
						
							
							
								
								Fix -o behavior to no longer swallow all remaining options  
							
							... 
							
							
							
							The current behavior was too error-prone because a "-o" option would
swallow all the following non-option parameters:
  pytest -o foo=bar path/to/test.py
path/to/test.py would be captured by the -o option, and would fail
because "path/to/test.py" is not in the format "key=value". 
							
						 
						
							2018-01-23 21:19:16 -02:00  
				
					
						
							
							
								 
						
							
								8426c57a9e 
								
							 
						 
						
							
							
								
								Ensure changes in the message in the future do not make the test pass by accident  
							
							
							
						 
						
							2018-01-23 21:18:59 -02:00  
				
					
						
							
							
								 
						
							
								203508d9f3 
								
							 
						 
						
							
							
								
								cleanup test cases  
							
							
							
						 
						
							2018-01-23 21:18:37 -02:00  
				
					
						
							
							
								 
						
							
								2c7f94fdb9 
								
							 
						 
						
							
							
								
								Added basic fix and test  
							
							
							
						 
						
							2018-01-23 21:18:10 -02:00  
				
					
						
							
							
								 
						
							
								bd1d17e8de 
								
							 
						 
						
							
							
								
								Replace py.std with stdlib imports  
							
							
							
						 
						
							2018-01-09 12:44:10 -08:00  
				
					
						
							
							
								 
						
							
								2a75ae46c3 
								
							 
						 
						
							
							
								
								Improve test that blocks setuptools plugins from being loaded  
							
							... 
							
							
							
							Make it a parametrized test to ensure all the mocked mechanisms in
the test actually work as expected when we *do not* use "-p no:" 
							
						 
						
							2017-11-28 21:29:58 -02:00  
				
					
						
							
							
								 
						
							
								833f33fa0c 
								
							 
						 
						
							
							
								
								removed comments  
							
							
							
						 
						
							2017-11-28 17:38:49 +01:00  
				
					
						
							
							
								 
						
							
								6843d45c51 
								
							 
						 
						
							
							
								
								added test for  #2920  fix  
							
							
							
						 
						
							2017-11-28 17:29:52 +01:00  
				
					
						
							
							
								 
						
							
								983a09a2d4 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into merge-master-into-features  
							
							
							
						 
						
							2017-11-10 18:33:02 -02:00  
				
					
						
							
							
								 
						
							
								03829fde8a 
								
							 
						 
						
							
							
								
								Fix linting E741: ambiguous variable name  
							
							
							
						 
						
							2017-11-04 13:59:10 -02:00