03829fde8a 
								
							 
						 
						
							
							
								
								Fix linting E741: ambiguous variable name  
							
							
							
						 
						
							2017-11-04 13:59:10 -02:00  
				
					
						
							
							
								 
						
							
								52aadcd7c1 
								
							 
						 
						
							
							
								
								Strip whitespace from markers in INI config  
							
							... 
							
							
							
							Resolves  #2856 . 
						
							2017-10-24 14:18:39 +03:00  
				
					
						
							
							
								 
						
							
								11b391ff49 
								
							 
						 
						
							
							
								
								Update mark.py  
							
							
							
						 
						
							2017-10-17 14:11:07 -07:00  
				
					
						
							
							
								 
						
							
								7093d8f65e 
								
							 
						 
						
							
							
								
								Add example of -k 'not test' in help text  
							
							
							
						 
						
							2017-09-30 18:43:20 -04:00  
				
					
						
							
							
								 
						
							
								1e93089165 
								
							 
						 
						
							
							
								
								[bugfix] Checking MarkDecorator equality returns False for non-MarkDecorator object  
							
							
							
						 
						
							2017-09-09 01:31:08 -04:00  
				
					
						
							
							
								 
						
							
								65b2de13a3 
								
							 
						 
						
							
							
								
								fix   #2540 , introduce mark.with_args  
							
							
							
						 
						
							2017-07-21 13:37:09 +02:00  
				
					
						
							
							
								 
						
							
								26ee2355d9 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/features' into fix-flake8-errors  
							
							
							
						 
						
							2017-07-19 17:09:05 -03:00  
				
					
						
							
							
								 
						
							
								62556bada6 
								
							 
						 
						
							
							
								
								remove the MARK_INFO_ATTRIBUTE warning until we can fix internal usage  
							
							... 
							
							
							
							fixes  #2573  
						
							2017-07-19 08:44:52 +02:00  
				
					
						
							
							
								 
						
							
								7b1870a94e 
								
							 
						 
						
							
							
								
								Fix flake8 in features branch  
							
							
							
						 
						
							2017-07-17 21:16:14 -03:00  
				
					
						
							
							
								 
						
							
								4fd92ef9ba 
								
							 
						 
						
							
							
								
								Merge branch 'fix-flake8-issues' into features  
							
							
							
						 
						
							2017-07-17 21:05:39 -03:00  
				
					
						
							
							
								 
						
							
								7248b759e8 
								
							 
						 
						
							
							
								
								Fixed E303 flake8 errors  
							
							... 
							
							
							
							too many blank lines (3) 
							
						 
						
							2017-07-17 01:44:23 +02:00  
				
					
						
							
							
								 
						
							
								b840622819 
								
							 
						 
						
							
							
								
								Fixed E302 flake8 errors  
							
							... 
							
							
							
							expected 2 blank lines, found 0 
							
						 
						
							2017-07-17 01:44:23 +02:00  
				
					
						
							
							
								 
						
							
								17a21d540b 
								
							 
						 
						
							
							
								
								Fixed E301 flake8 errors  
							
							... 
							
							
							
							expected 1 blank line, found 0 
							
						 
						
							2017-07-17 01:44:23 +02:00  
				
					
						
							
							
								 
						
							
								8f3eb6dfc7 
								
							 
						 
						
							
							
								
								Fixed E261 flake8 errors  
							
							... 
							
							
							
							at least two spaces before inline comment 
							
						 
						
							2017-07-17 01:44:22 +02:00  
				
					
						
							
							
								 
						
							
								0d0b01bded 
								
							 
						 
						
							
							
								
								introduce deprecation warnings for legacy parametersets,  fixes   #2427  
							
							
							
						 
						
							2017-06-23 22:06:49 +02:00  
				
					
						
							
							
								 
						
							
								23d016f114 
								
							 
						 
						
							
							
								
								address review comments  
							
							... 
							
							
							
							* enhance api for fetching marks off an object
* rename functions for storing marks
* enhance deprecation message for MarkInfo 
							
						 
						
							2017-06-23 11:05:38 +02:00  
				
					
						
							
							
								 
						
							
								1d926011a4 
								
							 
						 
						
							
							
								
								add deprecation warnings for using markinfo attributes  
							
							
							
						 
						
							2017-06-22 15:12:50 +02:00  
				
					
						
							
							
								 
						
							
								19b12b22e7 
								
							 
						 
						
							
							
								
								store pristine marks on function.pytestmark  
							
							... 
							
							
							
							fixes  #2516  
						
							2017-06-22 10:48:45 +02:00  
				
					
						
							
							
								 
						
							
								64ae6ae25d 
								
							 
						 
						
							
							
								
								extract application of marks and legacy markinfos  
							
							
							
						 
						
							2017-06-22 10:41:28 +02:00  
				
					
						
							
							
								 
						
							
								bdec2c8f9e 
								
							 
						 
						
							
							
								
								move marker transfer to _pytest.mark  
							
							
							
						 
						
							2017-06-22 08:45:10 +02:00  
				
					
						
							
							
								 
						
							
								d86c89e193 
								
							 
						 
						
							
							
								
								Revert refactor of old-style to new-style classes  
							
							... 
							
							
							
							As discussed in the mailing list, unfortunately this might break APIs
due to the subtle differences between new and old-style classes (see #2398 ).
This reverts commit d4afa1554b#2179 . 
							
						 
						
							2017-05-17 18:20:51 -03:00  
				
					
						
							
							
								 
						
							
								ebeba79be3 
								
							 
						 
						
							
							
								
								remove the namespace hook from mark after the param feature merge  
							
							
							
						 
						
							2017-03-28 11:45:06 +02:00  
				
					
						
							
							
								 
						
							
								839c936153 
								
							 
						 
						
							
							
								
								_pytest.mark: fix unconfigure after bad configure, still potential bug  
							
							
							
						 
						
							2017-03-28 11:45:06 +02:00  
				
					
						
							
							
								 
						
							
								90788defb2 
								
							 
						 
						
							
							
								
								remove pytest_namespace from _pytest.mark and fix latent pytest nesting bug  
							
							
							
						 
						
							2017-03-28 11:45:06 +02:00  
				
					
						
							
							
								 
						
							
								e368fb4b29 
								
							 
						 
						
							
							
								
								implement pytest.param  
							
							... 
							
							
							
							this allows a clear addition of parameterization parameters that carry along marks
instead of nesting multiple mark objects and destroying the possibility of creating
function valued parameters,
it just folders everything together into one object carrfying parameters, and the marks. 
							
						 
						
							2017-03-17 16:53:43 +01:00  
				
					
						
							
							
								 
						
							
								42a5d6bdfa 
								
							 
						 
						
							
							
								
								Add __future__ imports to all pytest modules  
							
							... 
							
							
							
							This prevents silly errors from creeping in Python 2 when testing in Python 3 
							
						 
						
							2017-03-16 22:45:40 -03:00  
				
					
						
							
							
								 
						
							
								1e0cf5ce4d 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into merge-master-into-features  
							
							... 
							
							
							
							# Conflicts:
#	AUTHORS
#	CHANGELOG.rst
#	_pytest/pytester.py 
							
						 
						
							2017-03-10 15:54:05 -03:00  
				
					
						
							
							
								 
						
							
								ede4e9171f 
								
							 
						 
						
							
							
								
								Spelling fixes  
							
							
							
						 
						
							2017-02-15 17:00:58 +02:00  
				
					
						
							
							
								 
						
							
								d4afa1554b 
								
							 
						 
						
							
							
								
								Refactored old style classes to new style classes  
							
							
							
						 
						
							2017-01-08 22:52:42 -06:00  
				
					
						
							
							
								 
						
							
								5ce551e469 
								
							 
						 
						
							
							
								
								Merge pull request  #2075  from pytest-dev/master  
							
							... 
							
							
							
							Merge master into features after fixing flake8 errors 
							
						 
						
							2016-11-22 14:10:31 -02:00  
				
					
						
							
							
								 
						
							
								1eb5a690d4 
								
							 
						 
						
							
							
								
								Fix flake8 E305 and E306 errors  
							
							... 
							
							
							
							These errors started to appear with flake8-3.1.1, while they don't appear with
version 3.1.0 (weird). 
							
						 
						
							2016-11-20 18:59:15 -02:00  
				
					
						
							
							
								 
						
							
								654af0ba25 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into features  
							
							
							
						 
						
							2016-09-26 19:32:53 -03:00  
				
					
						
							
							
								 
						
							
								1812387bf0 
								
							 
						 
						
							
							
								
								Mark: fix python 3 compatibility  
							
							
							
						 
						
							2016-09-08 10:03:45 +02:00  
				
					
						
							
							
								 
						
							
								10094a3f09 
								
							 
						 
						
							
							
								
								use consistent inner repressentation for marks  
							
							
							
						 
						
							2016-09-08 09:52:22 +02:00  
				
					
						
							
							
								 
						
							
								c60854474a 
								
							 
						 
						
							
							
								
								Fix keyword docs  
							
							
							
						 
						
							2016-09-05 16:48:04 +08:00  
				
					
						
							
							
								 
						
							
								406777d104 
								
							 
						 
						
							
							
								
								mark plugin: move the unclean marked parameter extraction  
							
							
							
						 
						
							2016-08-21 20:44:37 +02:00  
				
					
						
							
							
								 
						
							
								053c052190 
								
							 
						 
						
							
							
								
								Always lstrip() keyword expression  
							
							
							
						 
						
							2016-04-01 13:10:05 -04:00  
				
					
						
							
							
								 
						
							
								424b46de1b 
								
							 
						 
						
							
							
								
								Fix a typo in the docstring for mark.MarkGenerator  
							
							
							
						 
						
							2016-02-27 14:15:42 +01:00  
				
					
						
							
							
								 
						
							
								9906a19e29 
								
							 
						 
						
							
							
								
								Issue  #751  - fix.  
							
							
							
						 
						
							2015-07-25 15:38:27 +02:00  
				
					
						
							
							
								 
						
							
								df29120abe 
								
							 
						 
						
							
							
								
								Merge branch 'pytest-2.7'  
							
							... 
							
							
							
							Conflicts:
	_pytest/config.py
	_pytest/genscript.py
	_pytest/mark.py
	tox.ini 
							
						 
						
							2015-07-23 22:35:51 -03:00  
				
					
						
							
							
								 
						
							
								6af7172204 
								
							 
						 
						
							
							
								
								Merge branch 'pytest-2.7'  
							
							
							
						 
						
							2015-07-19 15:25:04 +02:00  
				
					
						
							
							
								 
						
							
								de65737cb1 
								
							 
						 
						
							
							
								
								Fix flakes  
							
							
							
						 
						
							2015-07-18 18:23:17 -03:00  
				
					
						
							
							
								 
						
							
								2f7d0f8bd9 
								
							 
						 
						
							
							
								
								Consider --color option in more places which deal with TerminalWriters  
							
							
							
						 
						
							2015-07-18 16:39:55 -03:00  
				
					
						
							
							
								 
						
							
								aa25fb05a9 
								
							 
						 
						
							
							
								
								Make sure marks in subclasses don't change marks in superclasses  
							
							... 
							
							
							
							Fix  #842  
						
							2015-07-16 19:29:16 -03:00  
				
					
						
							
							
								 
						
							
								715a235b45 
								
							 
						 
						
							
							
								
								remove shutdown logic from PluginManager and add a add_cleanup() API  
							
							... 
							
							
							
							for the already existing cleanup logic of the config object.
This simplifies lifecycle management as we don't keep two
layers of shutdown functions and also simplifies the pluginmanager
interface.
also add some docstrings.
--HG--
branch : plugin_no_pytest 
							
						 
						
							2015-04-22 16:33:20 +02:00  
				
					
						
							
							
								 
						
							
								55eb82c434 
								
							 
						 
						
							
							
								
								fix pep257  
							
							
							
						 
						
							2015-03-23 21:28:29 +01:00  
				
					
						
							
							
								 
						
							
								c019e489d2 
								
							 
						 
						
							
							
								
								Change docstring style  
							
							... 
							
							
							
							--HG--
branch : issue463 
							
						 
						
							2015-03-23 20:27:53 +01:00  
				
					
						
							
							
								 
						
							
								43e4fcf6dd 
								
							 
						 
						
							
							
								
								Raise specific MarkerError rather than generic ValueError  
							
							... 
							
							
							
							--HG--
branch : issue463 
							
						 
						
							2015-03-23 20:01:58 +01:00  
				
					
						
							
							
								 
						
							
								39158957f4 
								
							 
						 
						
							
							
								
								fix issue557: with "-k" we only allow the old style "-" for negation  
							
							... 
							
							
							
							at the beginning of strings and even that is deprecated.  Use "not" instead.
This should allow to pick parametrized tests where "-" appeared in the parameter.
--HG--
branch : issue557 
							
						 
						
							2014-10-06 12:11:48 +02:00  
				
					
						
							
							
								 
						
							
								3b8935c533 
								
							 
						 
						
							
							
								
								remove dupped_stdout logic and related changes, also simplify pytest_runtest_* calls to not use a contextlib with-decorator anymore.  
							
							
							
						 
						
							2014-04-01 15:03:17 +02:00