dbb1b5a227 
								
							 
						 
						
							
							
								
								remove NodeMarkers, turn own_markers into a list and use iter_markers api exclusively  
							
							
							
						 
						
							2018-03-29 18:24:10 +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  
				
					
						
							
							
								 
						
							
								4e405dd9f9 
								
							 
						 
						
							
							
								
								Show "short test summary info" after tracebacks and warnings  
							
							
							
						 
						
							2018-02-26 21:12:33 -03:00  
				
					
						
							
							
								 
						
							
								25a3e9296a 
								
							 
						 
						
							
							
								
								reduce the complexity of skipping terminal summary  
							
							
							
						 
						
							2018-02-22 14:18:49 +01:00  
				
					
						
							
							
								 
						
							
								cf40c0743c 
								
							 
						 
						
							
							
								
								move mark evaluator into mark package  
							
							
							
						 
						
							2018-02-22 14:05:10 +01:00  
				
					
						
							
							
								 
						
							
								f24c470403 
								
							 
						 
						
							
							
								
								Assume not skipped by mark if attribute missing  
							
							... 
							
							
							
							Fixes  #3074 . 
						
							2018-01-03 18:47:18 -05: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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								df37cdf51f 
								
							 
						 
						
							
							
								
								Merge pull request  #2808  from georgeyk/allow-module-level-skip  
							
							... 
							
							
							
							Allow module level skip 
							
						 
						
							2017-10-12 06:50:53 +02:00  
				
					
						
							
							
								 
						
							
								459cc40192 
								
							 
						 
						
							
							
								
								skipping: cleanup  
							
							... 
							
							
							
							remove dead comments
fix naming
remove dead code 
							
						 
						
							2017-10-06 10:44:49 +02:00  
				
					
						
							
							
								 
						
							
								e3b73682b2 
								
							 
						 
						
							
							
								
								flake8 fix  
							
							
							
						 
						
							2017-10-06 10:44:49 +02:00  
				
					
						
							
							
								 
						
							
								8480075f01 
								
							 
						 
						
							
							
								
								resuffle markevaluator internal structure  
							
							
							
						 
						
							2017-10-06 10:44:49 +02:00  
				
					
						
							
							
								 
						
							
								9ad2b75038 
								
							 
						 
						
							
							
								
								skipping: replace _evalskip with a more consistent _skipped_by_mark  
							
							
							
						 
						
							2017-10-06 10:44:49 +02:00  
				
					
						
							
							
								 
						
							
								03ce0adb79 
								
							 
						 
						
							
							
								
								Fix: handle CollectReport in folded_skips function  
							
							
							
						 
						
							2017-10-04 19:18:55 -03:00  
				
					
						
							
							
								 
						
							
								3b30c93f73 
								
							 
						 
						
							
							
								
								Deprecate TerminalReporter._tw  
							
							... 
							
							
							
							Fix  #2803  
						
							2017-09-27 17:16:34 -03:00  
				
					
						
							
							
								 
						
							
								98bf5fc9be 
								
							 
						 
						
							
							
								
								Fold skipped tests with global pytestmark variable  
							
							
							
						 
						
							2017-08-15 02:18:46 +03:00  
				
					
						
							
							
								 
						
							
								9e62a31b63 
								
							 
						 
						
							
							
								
								Merge pull request  #2650  from srinivasreddy/2642  
							
							... 
							
							
							
							Fixed#2642: Convert py module references to six module 
							
						 
						
							2017-08-04 09:21:51 +02:00  
				
					
						
							
							
								 
						
							
								dc563e4954 
								
							 
						 
						
							
							
								
								convert py module references to six module  
							
							
							
						 
						
							2017-08-04 08:05:03 +05:30  
				
					
						
							
							
								 
						
							
								be401bc2f8 
								
							 
						 
						
							
							
								
								fix linting issues  
							
							
							
						 
						
							2017-07-28 18:27:59 +02:00  
				
					
						
							
							
								 
						
							
								06a49338b2 
								
							 
						 
						
							
							
								
								make Test Outcomes inherit from BaseException instead of exception  
							
							... 
							
							
							
							fixes  #580  
						
							2017-07-28 15:28:51 +02:00  
				
					
						
							
							
								 
						
							
								869eed9898 
								
							 
						 
						
							
							
								
								Fix lineno offset in show_skipped  
							
							... 
							
							
							
							The line number is 0-based here, so add 1. 
							
						 
						
							2017-07-25 15:19:47 +02:00  
				
					
						
							
							
								 
						
							
								b840622819 
								
							 
						 
						
							
							
								
								Fixed E302 flake8 errors  
							
							... 
							
							
							
							expected 2 blank lines, found 0 
							
						 
						
							2017-07-17 01:44:23 +02:00  
				
					
						
							
							
								 
						
							
								195a816522 
								
							 
						 
						
							
							
								
								Fixed E265 flake8 errors  
							
							... 
							
							
							
							block comment should start with ‘# ‘ 
							
						 
						
							2017-07-17 01:44:22 +02:00  
				
					
						
							
							
								 
						
							
								cf97159009 
								
							 
						 
						
							
							
								
								Fixed E128 flake8 errors  
							
							... 
							
							
							
							continuation line under-indented for visual indent 
							
						 
						
							2017-07-17 01:28:16 +02:00  
				
					
						
							
							
								 
						
							
								92e2cd9c68 
								
							 
						 
						
							
							
								
								Fixed E125 flake8 errors  
							
							... 
							
							
							
							continuation line with same indent as next logical line 
							
						 
						
							2017-07-17 01:28:16 +02:00  
				
					
						
							
							
								 
						
							
								051d76a63f 
								
							 
						 
						
							
							
								
								Fixed E124 flake8 errors  
							
							... 
							
							
							
							closing bracket does not match visual indentation 
							
						 
						
							2017-07-17 01:28:16 +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  
				
					
						
							
							
								 
						
							
								7cdefce656 
								
							 
						 
						
							
							
								
								fix up oversights  
							
							
							
						 
						
							2017-03-28 11:45:06 +02:00  
				
					
						
							
							
								 
						
							
								92f6ab1881 
								
							 
						 
						
							
							
								
								fix all singular internal module imports and add a test for them  
							
							
							
						 
						
							2017-03-28 11:45:06 +02:00  
				
					
						
							
							
								 
						
							
								9b755f6ec6 
								
							 
						 
						
							
							
								
								remove pytest_namespace from _pytest.skipping  
							
							
							
						 
						
							2017-03-28 11:45:06 +02: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  
				
					
						
							
							
								 
						
							
								ccf9877447 
								
							 
						 
						
							
							
								
								Merge pull request  #2232  from vidartf/patch-1  
							
							... 
							
							
							
							Do not asssume `Item.obj` in 'skipping' plugin 
							
						 
						
							2017-02-03 21:39:42 -02:00  
				
					
						
							
							
								 
						
							
								a4d2a5785b 
								
							 
						 
						
							
							
								
								Merge pull request  #2142  from barneygale/xfail_without_condition_getglobals  
							
							... 
							
							
							
							'xfail' markers without a condition no longer rely on the underlying `Item` objects deriving from `PyobjMixin` 
							
						 
						
							2017-02-03 16:09:47 -02:00  
				
					
						
							
							
								 
						
							
								bad261279c 
								
							 
						 
						
							
							
								
								Do not asssume `Item.obj` in 'skipping' plugin  
							
							... 
							
							
							
							See #2231  for discussion. 
							
						 
						
							2017-02-03 16:04:34 +01:00  
				
					
						
							
							
								 
						
							
								713bdc1f9f 
								
							 
						 
						
							
							
								
								merge master into features  
							
							
							
						 
						
							2017-01-26 12:00:52 +01:00  
				
					
						
							
							
								 
						
							
								01eaf9db51 
								
							 
						 
						
							
							
								
								fix the xfail docstring typo at the actual docstring + regendoc  
							
							
							
						 
						
							2017-01-22 18:44:30 +01:00  
				
					
						
							
							
								 
						
							
								d4afa1554b 
								
							 
						 
						
							
							
								
								Refactored old style classes to new style classes  
							
							
							
						 
						
							2017-01-08 22:52:42 -06:00  
				
					
						
							
							
								 
						
							
								3d18c9c1c6 
								
							 
						 
						
							
							
								
								'xfail' markers without a condition no longer rely on the underlying `Item`  
							
							... 
							
							
							
							deriving from `PyobjMixin` 
							
						 
						
							2017-01-02 22:01:04 +00: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  
				
					
						
							
							
								 
						
							
								3ba475c0f2 
								
							 
						 
						
							
							
								
								Move internal _is_unittest_unexpected_success_a_failure to "compat" module  
							
							... 
							
							
							
							Fix  #1815  
						
							2016-08-17 22:50:10 -03:00  
				
					
						
							
							
								 
						
							
								463e6572c5 
								
							 
						 
						
							
							
								
								Merge branch 'master' into merge-master-into-features  
							
							... 
							
							
							
							Preparing for 3.0 
							
						 
						
							2016-08-17 22:39:23 -03:00  
				
					
						
							
							
								 
						
							
								4ed412eb59 
								
							 
						 
						
							
							
								
								unittest's unexpectedSuccess should work as non-strict xpass  
							
							... 
							
							
							
							Make sure tests for that behavior obtain the same return code
using either pytest or unittest to run the same file 
							
						 
						
							2016-08-17 21:32:04 -03:00  
				
					
						
							
							
								 
						
							
								225341cf2c 
								
							 
						 
						
							
							
								
								Set wasxfail only for xpass w/o strict and else set longrepr  
							
							
							
						 
						
							2016-08-13 00:00:51 +01:00  
				
					
						
							
							
								 
						
							
								296f42a2c9 
								
							 
						 
						
							
							
								
								Treat unittest.expectedFailure pass as a failure  
							
							
							
						 
						
							2016-08-12 23:18:36 +01:00  
				
					
						
							
							
								 
						
							
								4fc20d09fe 
								
							 
						 
						
							
							
								
								Change outcome to 'passed' for xfail unless it's strict  
							
							
							
						 
						
							2016-08-05 19:25:55 +01:00  
				
					
						
							
							
								 
						
							
								9dadaa8a41 
								
							 
						 
						
							
							
								
								skipping plugin: remove python2.5 compat code  
							
							
							
						 
						
							2016-07-20 17:45:20 +02:00