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  
				
					
						
							
							
								 
						
							
								99c4b6fdc3 
								
							 
						 
						
							
							
								
								issue 1496 - xfail with condition keyword  
							
							
							
						 
						
							2016-04-19 18:12:37 +01:00  
				
					
						
							
							
								 
						
							
								653a53226a 
								
							 
						 
						
							
							
								
								Add strict parameter to xfail marker doc  
							
							
							
						 
						
							2016-03-22 16:01:51 +04:00  
				
					
						
							
							
								 
						
							
								1fbd19b8cb 
								
							 
						 
						
							
							
								
								Fix pytest.mark.skip mark when used in strict mode  
							
							
							
						 
						
							2016-03-22 15:40:34 +04:00  
				
					
						
							
							
								 
						
							
								5f90907509 
								
							 
						 
						
							
							
								
								Fix skip/xfail markers in parametrized arguments  
							
							... 
							
							
							
							Fix  #1412  
						
							2016-02-25 19:13:09 -03:00  
				
					
						
							
							
								 
						
							
								0eeb466f11 
								
							 
						 
						
							
							
								
								Fix strict xfail: it should behave exactly like xfail when a test fails  
							
							
							
						 
						
							2016-02-15 19:18:48 -02:00  
				
					
						
							
							
								 
						
							
								ee88679c54 
								
							 
						 
						
							
							
								
								Fix bug in strict xfail: test was not being actually called  
							
							
							
						 
						
							2016-02-15 18:43:45 -02:00  
				
					
						
							
							
								 
						
							
								7823838e69 
								
							 
						 
						
							
							
								
								Add strict option to xfail, making tests which XPASS to actually fail the suite  
							
							... 
							
							
							
							Fix  #1355  
						
							2016-02-14 20:52:27 -02:00  
				
					
						
							
							
								 
						
							
								a912d3745b 
								
							 
						 
						
							
							
								
								Moved py.code code over to py.test  
							
							... 
							
							
							
							Fix  #103  
						
							2016-01-25 23:18:04 -02:00  
				
					
						
							
							
								 
						
							
								fbac936596 
								
							 
						 
						
							
							
								
								Add -rp and -rP options to report passing tests.  
							
							... 
							
							
							
							-rP is an alternative to `-s` for viewing the output of passing tests.
This causes the captured stdout/stderr of passing tests to be output in
the same way as that of failing tests.
-rp adds a simple one-line-per-test summary for passing tests.
Neither option is included by -ra.
Additional changes to `pytest_capturelog` and `pytest_catchlog` are
needed for this option to also output captured logs: They must be
changed to use `rep.sections.add` instead of `rep.longrepr.addsection`,
and to add these additional sections even if the test passes, since
passing tests don't seem to have a `longrepr` at report time. 
							
						 
						
							2015-12-07 11:32:56 -10:00  
				
					
						
							
							
								 
						
							
								df874db817 
								
							 
						 
						
							
							
								
								Update default reason to "unconditional skip"  
							
							
							
						 
						
							2015-10-03 17:02:18 +01:00  
				
					
						
							
							
								 
						
							
								25d74a5919 
								
							 
						 
						
							
							
								
								Dont explicitly inherit from object  
							
							
							
						 
						
							2015-10-03 16:55:04 +01:00  
				
					
						
							
							
								 
						
							
								213dbe7a5f 
								
							 
						 
						
							
							
								
								newlines  
							
							
							
						 
						
							2015-10-03 16:42:15 +01:00  
				
					
						
							
							
								 
						
							
								9e57954b03 
								
							 
						 
						
							
							
								
								First argument in pytest.mark.skip is a reason  
							
							
							
						 
						
							2015-10-03 16:42:15 +01:00  
				
					
						
							
							
								 
						
							
								eee24138b0 
								
							 
						 
						
							
							
								
								Fix failing test  
							
							
							
						 
						
							2015-10-03 16:42:15 +01:00  
				
					
						
							
							
								 
						
							
								04545f8a54 
								
							 
						 
						
							
							
								
								classes inherit from object  
							
							
							
						 
						
							2015-10-03 16:42:15 +01:00  
				
					
						
							
							
								 
						
							
								ad0b8e31b8 
								
							 
						 
						
							
							
								
								Fix case where skip is assigned to as an attribute directly  
							
							
							
						 
						
							2015-10-03 16:42:14 +01:00  
				
					
						
							
							
								 
						
							
								b71add27da 
								
							 
						 
						
							
							
								
								Add MarkEvaluator for skip  
							
							
							
						 
						
							2015-10-03 16:42:14 +01:00  
				
					
						
							
							
								 
						
							
								6af7172204 
								
							 
						 
						
							
							
								
								Merge branch 'pytest-2.7'  
							
							
							
						 
						
							2015-07-19 15:25:04 +02:00  
				
					
						
							
							
								 
						
							
								953916df49 
								
							 
						 
						
							
							
								
								Report correct reason when using multiple skip/xfail markers  
							
							
							
						 
						
							2015-07-18 18:18:45 -03:00  
				
					
						
							
							
								 
						
							
								13c01193d6 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/pytest-2.7'  
							
							
							
						 
						
							2015-06-19 10:03:37 +02:00  
				
					
						
							
							
								 
						
							
								9d4e0365da 
								
							 
						 
						
							
							
								
								Skipif marker report now refers to the skipped function  
							
							... 
							
							
							
							Fix  #114  
						
							2015-06-18 21:59:44 -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