Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								03829fde8a 
								
							 
						 
						
							
							
								
								Fix linting E741: ambiguous variable name  
							
							 
							
							
							
						 
						
							2017-11-04 13:59:10 -02:00  
						
					 
				
					
						
							
							
								 
								Oliver Bestwalter
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								2802135741 
								
							 
						 
						
							
							
								
								fix 'DoctestItem' object has no attribute '_fixtureinfo'  
							
							 
							
							... 
							
							
							
							* doxtests don't seem to have this attribute, so nothing will be written in that case.
* tried to be a good boy scout and tidied up surrounding code a bit (comments, shadowed/unused names, removed random new lines, naming things) 
							
						 
						
							2017-09-19 12:41:12 +02:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								06a49338b2 
								
							 
						 
						
							
							
								
								make Test Outcomes inherit from BaseException instead of exception  
							
							 
							
							... 
							
							
							
							fixes  #580  
							
						 
						
							2017-07-28 15:28:51 +02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								3d89905114 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into features  
							
							 
							
							
							
						 
						
							2017-07-26 19:01:28 -03:00  
						
					 
				
					
						
							
							
								 
								Daniel Hahler
							
						 
						
							 
							
							
							
							
								
							
							
								72531f30c0 
								
							 
						 
						
							
							
								
								Improve error message for CollectError with skip/skipif  
							
							 
							
							
							
						 
						
							2017-07-25 15:14:28 +02:00  
						
					 
				
					
						
							
							
								 
								Kale Kundert
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								7e0553267d 
								
							 
						 
						
							
							
								
								Remove unused import.  
							
							 
							
							
							
						 
						
							2017-07-22 09:19:13 -07:00  
						
					 
				
					
						
							
							
								 
								Kale Kundert
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								a3b35e1c4b 
								
							 
						 
						
							
							
								
								Remove `raises` and `approx` from `python.py`.  
							
							 
							
							... 
							
							
							
							These two classes were recently moved to `python_api.py`, but it seems
that they found their way back into the original file somehow.  This
commit removes them again to avoid out-of-date code duplication. 
							
						 
						
							2017-07-22 08:36:15 -07:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								d44565f385 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into fix-flake8-errors  
							
							 
							
							
							
						 
						
							2017-07-19 17:57:30 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								c92760dca8 
								
							 
						 
						
							
							
								
								Merge branch 'fix-flake8-issues'  
							
							 
							
							
							
						 
						
							2017-07-19 17:03:36 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								7b1870a94e 
								
							 
						 
						
							
							
								
								Fix flake8 in features branch  
							
							 
							
							
							
						 
						
							2017-07-17 21:16:14 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								4fd92ef9ba 
								
							 
						 
						
							
							
								
								Merge branch 'fix-flake8-issues' into features  
							
							 
							
							
							
						 
						
							2017-07-17 21:05:39 -03:00  
						
					 
				
					
						
							
							
								 
								Andras Tim
							
						 
						
							 
							
							
							
							
								
							
							
								b49e8baab3 
								
							 
						 
						
							
							
								
								Fixed E731 flake8 errors  
							
							 
							
							... 
							
							
							
							do not assign a lambda expression, use a def 
							
						 
						
							2017-07-17 01:44:23 +02:00  
						
					 
				
					
						
							
							
								 
								Andras Tim
							
						 
						
							 
							
							
							
							
								
							
							
								7248b759e8 
								
							 
						 
						
							
							
								
								Fixed E303 flake8 errors  
							
							 
							
							... 
							
							
							
							too many blank lines (3) 
							
						 
						
							2017-07-17 01:44:23 +02:00  
						
					 
				
					
						
							
							
								 
								Andras Tim
							
						 
						
							 
							
							
							
							
								
							
							
								b840622819 
								
							 
						 
						
							
							
								
								Fixed E302 flake8 errors  
							
							 
							
							... 
							
							
							
							expected 2 blank lines, found 0 
							
						 
						
							2017-07-17 01:44:23 +02:00  
						
					 
				
					
						
							
							
								 
								Andras Tim
							
						 
						
							 
							
							
							
							
								
							
							
								17a21d540b 
								
							 
						 
						
							
							
								
								Fixed E301 flake8 errors  
							
							 
							
							... 
							
							
							
							expected 1 blank line, found 0 
							
						 
						
							2017-07-17 01:44:23 +02:00  
						
					 
				
					
						
							
							
								 
								Andras Tim
							
						 
						
							 
							
							
							
							
								
							
							
								195a816522 
								
							 
						 
						
							
							
								
								Fixed E265 flake8 errors  
							
							 
							
							... 
							
							
							
							block comment should start with ‘# ‘ 
							
						 
						
							2017-07-17 01:44:22 +02:00  
						
					 
				
					
						
							
							
								 
								Andras Tim
							
						 
						
							 
							
							
							
							
								
							
							
								8f3eb6dfc7 
								
							 
						 
						
							
							
								
								Fixed E261 flake8 errors  
							
							 
							
							... 
							
							
							
							at least two spaces before inline comment 
							
						 
						
							2017-07-17 01:44:22 +02:00  
						
					 
				
					
						
							
							
								 
								Andras Tim
							
						 
						
							 
							
							
							
							
								
							
							
								b226454582 
								
							 
						 
						
							
							
								
								Fixed E251 flake8 errors  
							
							 
							
							... 
							
							
							
							unexpected spaces around keyword / parameter equals 
							
						 
						
							2017-07-17 01:44:22 +02:00  
						
					 
				
					
						
							
							
								 
								Andras Tim
							
						 
						
							 
							
							
							
							
								
							
							
								617e510b6e 
								
							 
						 
						
							
							
								
								Fixed E231 flake8 errors  
							
							 
							
							... 
							
							
							
							missing whitespace after ‘,’, ‘;’, or ‘:’ 
							
						 
						
							2017-07-17 01:44:22 +02:00  
						
					 
				
					
						
							
							
								 
								Andras Tim
							
						 
						
							 
							
							
							
							
								
							
							
								4b22f270a3 
								
							 
						 
						
							
							
								
								Fixed E226 flake8 errors  
							
							 
							
							... 
							
							
							
							missing whitespace around arithmetic operator 
							
						 
						
							2017-07-17 01:44:22 +02:00  
						
					 
				
					
						
							
							
								 
								Andras Tim
							
						 
						
							 
							
							
							
							
								
							
							
								2e8caefcab 
								
							 
						 
						
							
							
								
								Fixed E225 flake8 errors  
							
							 
							
							... 
							
							
							
							missing whitespace around operator 
							
						 
						
							2017-07-17 01:44:22 +02:00  
						
					 
				
					
						
							
							
								 
								Andras Tim
							
						 
						
							 
							
							
							
							
								
							
							
								df54bf0db5 
								
							 
						 
						
							
							
								
								Fixed E131 flake8 errors  
							
							 
							
							... 
							
							
							
							continuation line unaligned for hanging indent 
							
						 
						
							2017-07-17 01:28:16 +02:00  
						
					 
				
					
						
							
							
								 
								Andras Tim
							
						 
						
							 
							
							
							
							
								
							
							
								cf97159009 
								
							 
						 
						
							
							
								
								Fixed E128 flake8 errors  
							
							 
							
							... 
							
							
							
							continuation line under-indented for visual indent 
							
						 
						
							2017-07-17 01:28:16 +02:00  
						
					 
				
					
						
							
							
								 
								Andras Tim
							
						 
						
							 
							
							
							
							
								
							
							
								57438f3efe 
								
							 
						 
						
							
							
								
								Fixed E127 flake8 errors  
							
							 
							
							... 
							
							
							
							continuation line over-indented for visual indent 
							
						 
						
							2017-07-17 01:28:16 +02:00  
						
					 
				
					
						
							
							
								 
								Andras Tim
							
						 
						
							 
							
							
							
							
								
							
							
								e855a79dd4 
								
							 
						 
						
							
							
								
								Fixed E126 flake8 errors  
							
							 
							
							... 
							
							
							
							continuation line over-indented for hanging indent 
							
						 
						
							2017-07-17 01:28:16 +02:00  
						
					 
				
					
						
							
							
								 
								Andras Tim
							
						 
						
							 
							
							
							
							
								
							
							
								92e2cd9c68 
								
							 
						 
						
							
							
								
								Fixed E125 flake8 errors  
							
							 
							
							... 
							
							
							
							continuation line with same indent as next logical line 
							
						 
						
							2017-07-17 01:28:16 +02:00  
						
					 
				
					
						
							
							
								 
								Andras Tim
							
						 
						
							 
							
							
							
							
								
							
							
								051d76a63f 
								
							 
						 
						
							
							
								
								Fixed E124 flake8 errors  
							
							 
							
							... 
							
							
							
							closing bracket does not match visual indentation 
							
						 
						
							2017-07-17 01:28:16 +02:00  
						
					 
				
					
						
							
							
								 
								Andras Tim
							
						 
						
							 
							
							
							
							
								
							
							
								6146ac97d9 
								
							 
						 
						
							
							
								
								Fixed E101 flake8 errors  
							
							 
							
							... 
							
							
							
							indentation contains mixed spaces and tabs 
							
						 
						
							2017-07-17 01:28:16 +02:00  
						
					 
				
					
						
							
							
								 
								Martin Altmayer
							
						 
						
							 
							
							
							
							
								
							
							
								e5169a026a 
								
							 
						 
						
							
							
								
								#2574 : --fixtures, --fixtures-per-test keep indentation of docstring  
							
							 
							
							
							
						 
						
							2017-07-15 13:33:11 +02:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								81cec9f5e3 
								
							 
						 
						
							
							
								
								Merge pull request  #2563  from pv/yield-warn-spam  
							
							 
							
							... 
							
							
							
							Make YIELD_TEST warning less spammy 
							
						 
						
							2017-07-13 10:45:46 +02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								d9aaab7ab2 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into features  
							
							 
							
							
							
						 
						
							2017-07-10 17:51:59 -03:00  
						
					 
				
					
						
							
							
								 
								Pauli Virtanen
							
						 
						
							 
							
							
							
							
								
							
							
								8a7d98fed9 
								
							 
						 
						
							
							
								
								Make YIELD_TEST warning less spammy  
							
							 
							
							... 
							
							
							
							Emit it only once per each generator, rather than for each generated
function. Also add information about which test caused it to be emitted. 
							
						 
						
							2017-07-10 21:41:09 +02:00  
						
					 
				
					
						
							
							
								 
								John Still
							
						 
						
							 
							
							
							
							
								
							
							
								80595115b0 
								
							 
						 
						
							
							
								
								replace all _escape_strings to _ascii_escaped  
							
							 
							
							
							
						 
						
							2017-07-10 12:32:27 -05:00  
						
					 
				
					
						
							
							
								 
								Nathaniel Waisbrot
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								9b9fede5be 
								
							 
						 
						
							
							
								
								allow staticmethods to be detected as test functions  
							
							 
							
							... 
							
							
							
							Allow a class method decorated `@staticmethod` to be collected as a test
function (if it meets the usual criteria).
This feature will not work in Python 2.6 -- static methods will still be
ignored there. 
							
						 
						
							2017-06-29 07:44:36 -04:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								8d5f2872d3 
								
							 
						 
						
							
							
								
								minor code style fix  
							
							 
							
							
							
						 
						
							2017-06-23 11:59:03 +02:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								bdec2c8f9e 
								
							 
						 
						
							
							
								
								move marker transfer to _pytest.mark  
							
							 
							
							
							
						 
						
							2017-06-22 08:45:10 +02:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								6be57a3711 
								
							 
						 
						
							
							
								
								move python api helpers out of the python module  
							
							 
							
							... 
							
							
							
							this separates exposed normal api from collection elements 
							
						 
						
							2017-06-11 12:27:16 +02:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								36251e0db4 
								
							 
						 
						
							
							
								
								move approx to own file  
							
							 
							
							
							
						 
						
							2017-06-11 12:15:30 +02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								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  
						
					 
				
					
						
							
							
								 
								Vitaly Lashmanov
							
						 
						
							 
							
							
							
							
								
							
							
								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  
						
					 
				
					
						
							
							
								 
								Kodi Arfer
							
						 
						
							 
							
							
							
							
								
							
							
								dcefb287fc 
								
							 
						 
						
							
							
								
								Try not to assume a module's file extension is .py  
							
							 
							
							
							
						 
						
							2017-04-19 12:26:56 -07:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								58ac4faf0c 
								
							 
						 
						
							
							
								
								Fix exception formatting while importing test modules  
							
							 
							
							... 
							
							
							
							Fix  #2336  
							
						 
						
							2017-03-29 14:43:13 -03:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								6165939b0d 
								
							 
						 
						
							
							
								
								fix rebase mistakes  
							
							 
							
							
							
						 
						
							2017-03-28 11:45:06 +02:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								7cdefce656 
								
							 
						 
						
							
							
								
								fix up oversights  
							
							 
							
							
							
						 
						
							2017-03-28 11:45:06 +02:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								92f6ab1881 
								
							 
						 
						
							
							
								
								fix all singular internal module imports and add a test for them  
							
							 
							
							
							
						 
						
							2017-03-28 11:45:06 +02:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								ae234786ea 
								
							 
						 
						
							
							
								
								remove pytest_namespace from _pytest.python  
							
							 
							
							
							
						 
						
							2017-03-28 11:45:06 +02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								fa56114115 
								
							 
						 
						
							
							
								
								Clean up warnings generated by pytest's own suite  
							
							 
							
							
							
						 
						
							2017-03-20 22:13:17 -03:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								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  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								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  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								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