dbb1b5a227 
								
							 
						 
						
							
							
								
								remove NodeMarkers, turn own_markers into a list and use iter_markers api exclusively  
							
							
							
						 
						
							2018-03-29 18:24:10 +02:00  
				
					
						
							
							
								 
						
							
								159ea9b7c0 
								
							 
						 
						
							
							
								
								turn Markinfo into atts clsas, and return correct instances of it from node.get_marker  
							
							
							
						 
						
							2018-03-29 17:52:01 +02:00  
				
					
						
							
							
								 
						
							
								180ae09202 
								
							 
						 
						
							
							
								
								deprecate markinfo and fix up most marker scoping access while completely breaking metafunc testing  
							
							
							
						 
						
							2018-03-29 17:52:01 +02:00  
				
					
						
							
							
								 
						
							
								f1a1695aaa 
								
							 
						 
						
							
							
								
								enable deep merging test - new structure fixed it  
							
							
							
						 
						
							2018-03-29 17:52:01 +02:00  
				
					
						
							
							
								 
						
							
								2707221559 
								
							 
						 
						
							
							
								
								port mark evaluation to the new storage and fix a bug in evaluation  
							
							
							
						 
						
							2018-03-29 17:52:01 +02:00  
				
					
						
							
							
								 
						
							
								17a1ed5edf 
								
							 
						 
						
							
							
								
								use a constant to sort out repeated use of the EMPTY_PARAMETERSET_OPTION  
							
							
							
						 
						
							2018-01-26 12:12:26 +01:00  
				
					
						
							
							
								 
						
							
								a54cd4c2fd 
								
							 
						 
						
							
							
								
								correct testing and usage of the empty_parameter_set_mark config option  
							
							
							
						 
						
							2018-01-26 12:05:52 +01:00  
				
					
						
							
							
								 
						
							
								d4c11e58aa 
								
							 
						 
						
							
							
								
								exted empty parameterset check with reason test  
							
							
							
						 
						
							2018-01-26 11:18:50 +01:00  
				
					
						
							
							
								 
						
							
								37b41de779 
								
							 
						 
						
							
							
								
								fix   #2527  - introduce a option to pic the empty parameterset action  
							
							
							
						 
						
							2018-01-26 11:10:00 +01:00  
				
					
						
							
							
								 
						
							
								8433e2ba04 
								
							 
						 
						
							
							
								
								#2953  fix comments: fix exception type  
							
							
							
						 
						
							2018-01-16 23:35:57 +03:00  
				
					
						
							
							
								 
						
							
								076fb56f85 
								
							 
						 
						
							
							
								
								show a simple and easy error when keyword expressions trigger a syntax error  
							
							
							
						 
						
							2018-01-16 21:30:44 +03:00  
				
					
						
							
							
								 
						
							
								05cfdcc8cb 
								
							 
						 
						
							
							
								
								Revert making TerminalWriter public in TerminalReporter plugin  
							
							... 
							
							
							
							We eventually want to replace py.io.TerminalWriter (exposed as
"_tw" in TerminalReporter) by something else, so deprecating access
to "_tw" and making it public as "writer" is contrary to that. 
							
						 
						
							2017-11-23 19:53:12 -02:00  
				
					
						
							
							
								 
						
							
								5e71ffab87 
								
							 
						 
						
							
							
								
								Handle marks without description  
							
							
							
						 
						
							2017-11-22 15:47:15 +03:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								e86ba41a32 
								
							 
						 
						
							
							
								
								Add testcase for  #2819  
							
							
							
						 
						
							2017-10-09 01:06:25 +09:00  
				
					
						
							
							
								 
						
							
								1e93089165 
								
							 
						 
						
							
							
								
								[bugfix] Checking MarkDecorator equality returns False for non-MarkDecorator object  
							
							
							
						 
						
							2017-09-09 01:31:08 -04:00  
				
					
						
							
							
								 
						
							
								0726d9a09f 
								
							 
						 
						
							
							
								
								Turn warnings into errors in pytest's own test suite  
							
							... 
							
							
							
							Fix  #2588  
						
							2017-07-22 21:44:18 -03:00  
				
					
						
							
							
								 
						
							
								65b2de13a3 
								
							 
						 
						
							
							
								
								fix   #2540 , introduce mark.with_args  
							
							
							
						 
						
							2017-07-21 13:37:09 +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  
				
					
						
							
							
								 
						
							
								617e510b6e 
								
							 
						 
						
							
							
								
								Fixed E231 flake8 errors  
							
							... 
							
							
							
							missing whitespace after ‘,’, ‘;’, or ‘:’ 
							
						 
						
							2017-07-17 01:44:22 +02:00  
				
					
						
							
							
								 
						
							
								df54bf0db5 
								
							 
						 
						
							
							
								
								Fixed E131 flake8 errors  
							
							... 
							
							
							
							continuation line unaligned for hanging indent 
							
						 
						
							2017-07-17 01:28:16 +02:00  
				
					
						
							
							
								 
						
							
								e855a79dd4 
								
							 
						 
						
							
							
								
								Fixed E126 flake8 errors  
							
							... 
							
							
							
							continuation line over-indented for hanging indent 
							
						 
						
							2017-07-17 01:28:16 +02:00  
				
					
						
							
							
								 
						
							
								19b12b22e7 
								
							 
						 
						
							
							
								
								store pristine marks on function.pytestmark  
							
							... 
							
							
							
							fixes  #2516  
						
							2017-06-22 10:48:45 +02:00  
				
					
						
							
							
								 
						
							
								f3b359f5b8 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into merge-master-into-features  
							
							... 
							
							
							
							# Conflicts:
#	_pytest/capture.py
#	_pytest/compat.py
#	_pytest/python.py
#	testing/python/collect.py
#	testing/test_mark.py 
							
						 
						
							2017-05-03 19:04:53 -03:00  
				
					
						
							
							
								 
						
							
								60b8339166 
								
							 
						 
						
							
							
								
								Issue  #2383  - Show the correct error message when collect "parametrize" func with wrong args and add test for this case.  
							
							
							
						 
						
							2017-04-29 14:32:09 +03: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  
				
					
						
							
							
								 
						
							
								e5021dc9dc 
								
							 
						 
						
							
							
								
								Replace py.builtin.print_() calls by builtin print() function  
							
							
							
						 
						
							2017-03-16 22:46:51 -03: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  
				
					
						
							
							
								 
						
							
								fb0b90646e 
								
							 
						 
						
							
							
								
								New-style classes implemented for python 2.7 -  #2147  
							
							
							
						 
						
							2017-02-16 20:28:17 +01: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  
				
					
						
							
							
								 
						
							
								10094a3f09 
								
							 
						 
						
							
							
								
								use consistent inner repressentation for marks  
							
							
							
						 
						
							2016-09-08 09:52:22 +02:00  
				
					
						
							
							
								 
						
							
								458ecae1df 
								
							 
						 
						
							
							
								
								Replace all usages of "pytest_funcarg__" for @pytest.fixture  
							
							
							
						 
						
							2016-07-11 22:21:52 -03:00  
				
					
						
							
							
								 
						
							
								76756c0c0b 
								
							 
						 
						
							
							
								
								mark tests: use better name of the test for  #568  
							
							
							
						 
						
							2016-06-27 11:57:21 +02:00  
				
					
						
							
							
								 
						
							
								95b83958f4 
								
							 
						 
						
							
							
								
								add xfailing test for issue  #568  
							
							
							
						 
						
							2016-06-25 15:49:23 +02:00  
				
					
						
							
							
								 
						
							
								ec5e05834f 
								
							 
						 
						
							
							
								
								fix typo  
							
							
							
						 
						
							2016-05-18 21:35:31 +02:00  
				
					
						
							
							
								 
						
							
								98dd2ce75c 
								
							 
						 
						
							
							
								
								document reason for  #1540  
							
							
							
						 
						
							2016-04-28 16:22:31 +02:00  
				
					
						
							
							
								 
						
							
								308e76e19c 
								
							 
						 
						
							
							
								
								add xfailing test for  #1540  
							
							
							
						 
						
							2016-04-28 16:11:30 +02:00  
				
					
						
							
							
								 
						
							
								1ee3d40dbe 
								
							 
						 
						
							
							
								
								allow parametrized nodes to be specified from command line  
							
							
							
						 
						
							2016-03-13 23:37:21 +02:00  
				
					
						
							
							
								 
						
							
								af893aab26 
								
							 
						 
						
							
							
								
								Remove code related to support python <= 2.5  
							
							... 
							
							
							
							Fix  #1226  
						
							2015-12-16 16:16:22 -02:00  
				
					
						
							
							
								 
						
							
								e8f4819876 
								
							 
						 
						
							
							
								
								Test file run twice fails if it contains marked class  #683  
							
							
							
						 
						
							2015-07-26 12:15:29 +02:00  
				
					
						
							
							
								 
						
							
								6af7172204 
								
							 
						 
						
							
							
								
								Merge branch 'pytest-2.7'  
							
							
							
						 
						
							2015-07-19 15:25:04 +02:00  
				
					
						
							
							
								 
						
							
								aa25fb05a9 
								
							 
						 
						
							
							
								
								Make sure marks in subclasses don't change marks in superclasses  
							
							... 
							
							
							
							Fix  #842  
						
							2015-07-16 19:29:16 -03:00  
				
					
						
							
							
								 
						
							
								bddc88f09e 
								
							 
						 
						
							
							
								
								adapt to pluggy naming, rename pytest.hookspec_opts to pytest.hookspec,s ame with hookimpl_opts  
							
							... 
							
							
							
							--HG--
branch : pluggy1 
							
						 
						
							2015-05-06 10:08:08 +02:00  
				
					
						
							
							
								 
						
							
								d2a5c7f99b 
								
							 
						 
						
							
							
								
								add documented hookimpl_opts and hookspec_opts decorators  
							
							... 
							
							
							
							so that one doesn't have to use pytest.mark or function-attribute setting anymore
--HG--
branch : more_plugin 
							
						 
						
							2015-04-25 11:29:11 +02:00  
				
					
						
							
							
								 
						
							
								0253f7b8d5 
								
							 
						 
						
							
							
								
								remove all occurences of "__multicall__" on hook impls in pytest/*.  
							
							... 
							
							
							
							also simplify pytest_runtest_markereport hook in _pytest/skipping.py
while touching the code anyway. 
							
						 
						
							2014-10-08 20:23:40 +02:00