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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								d73e689991 
								
							 
						 
						
							
							
								
								fix issue616 - conftest visibility fixes.  This is achieved by  
							
							... 
							
							
							
							refactoring how nodeid's are constructed.  They now are always
relative to the "common rootdir" of a test run which is determined by
finding a common ancestor of all testrun arguments.
--HG--
branch : issue616 
							
						 
						
							2015-02-26 21:56:44 +01: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  
				
					
						
							
							
								 
						
							
								62b8712ca9 
								
							 
						 
						
							
							
								
								Let xfail work on non-python Items  
							
							... 
							
							
							
							For some reason xfail was only implemented on non-python Item
instances.  This removes this guard which means plugins creating new
items can raise pytest.xfail.Exception and it will work as expected. 
							
						 
						
							2014-09-23 23:55:26 +01:00  
				
					
						
							
							
								 
						
							
								5603a0cd4b 
								
							 
						 
						
							
							
								
								Removing py.std usage from _pytest  
							
							
							
						 
						
							2014-07-31 19:13:40 -03:00  
				
					
						
							
							
								 
						
							
								6a4492a22d 
								
							 
						 
						
							
							
								
								isinstance() on exception value instead of comparing types, consolidate tests  
							
							... 
							
							
							
							--HG--
branch : xfail-cause 
							
						 
						
							2014-07-26 17:46:50 +02:00  
				
					
						
							
							
								 
						
							
								7b273b8577 
								
							 
						 
						
							
							
								
								Add mark.xfail argument raises so that unexpected exceptions show up as test failures.  
							
							... 
							
							
							
							--HG--
branch : xfail-cause 
							
						 
						
							2014-07-26 15:11:05 +02:00  
				
					
						
							
							
								 
						
							
								9711e335d9 
								
							 
						 
						
							
							
								
								Change XPASS colour to be yellow rather then red  
							
							... 
							
							
							
							Unfortunately I'm not sure how to test this. 
							
						 
						
							2014-04-12 10:27:12 -04:00  
				
					
						
							
							
								 
						
							
								9fb2079458 
								
							 
						 
						
							
							
								
								replace py.test module references with pytest  
							
							... 
							
							
							
							The only remaining 'py.test' references are:
 * those referring to the 'py.test' executable
 * those in code explicitly testing py.test/pytest module compatibility
 * those in old CHANGES documentation
 * those in documentation generated based on external data
 * those in seemingly unfinished & unmaintained Japanese documentation
Minor stylistic changes and typo corrections made to documentation next to
several applied py.test --> pytest content changes. 
							
						 
						
							2014-01-18 12:31:33 +01:00  
				
					
						
							
							
								 
						
							
								8ac5af2896 
								
							 
						 
						
							
							
								
								fix flakes issues and make --flakes run part of tox runs  
							
							
							
						 
						
							2013-10-12 15:39:22 +02:00  
				
					
						
							
							
								 
						
							
								a5d4c20905 
								
							 
						 
						
							
							
								
								make "--runxfail" turn imperative pytest.xfail calls into no ops  
							
							... 
							
							
							
							(it already did neutralize pytest.mark.xfail markers) 
							
						 
						
							2013-10-09 22:55:20 +02:00  
				
					
						
							
							
								 
						
							
								bbd265184d 
								
							 
						 
						
							
							
								
								support boolean condition expressions in skipif/xfail  
							
							... 
							
							
							
							change documentation to prefer it over string expressions 
							
						 
						
							2013-05-07 18:40:26 +02:00  
				
					
						
							
							
								 
						
							
								6d1662e4b7 
								
							 
						 
						
							
							
								
								Use py.builtin._basestring  
							
							
							
						 
						
							2013-02-15 13:38:40 +00:00  
				
					
						
							
							
								 
						
							
								48e6aa9dc7 
								
							 
						 
						
							
							
								
								Allow MarkEvaluator expressions to be unicode  
							
							... 
							
							
							
							This fixes issue #266 . 
							
						 
						
							2013-02-15 11:47:48 +00:00  
				
					
						
							
							
								 
						
							
								289ee1c6ea 
								
							 
						 
						
							
							
								
								prepare a 2.3.1  
							
							
							
						 
						
							2012-10-20 14:05:33 +02:00  
				
					
						
							
							
								 
						
							
								f41f7fda68 
								
							 
						 
						
							
							
								
								improve --markers output  
							
							
							
						 
						
							2012-10-20 13:56:53 +02:00  
				
					
						
							
							
								 
						
							
								6e0c30d67d 
								
							 
						 
						
							
							
								
								fix skip/xfail confusion, reported and discussed on  
							
							... 
							
							
							
							http://stackoverflow.com/questions/11105828/in-py-test-when-i-explicitly-skip-a-test-that-is-marked-as-xfail-how-can-i-get  
						
							2012-06-23 11:32:32 +02:00  
				
					
						
							
							
								 
						
							
								1bbe1d086c 
								
							 
						 
						
							
							
								
								fix issue160 a failing setup of an xfail-marked tests should  
							
							... 
							
							
							
							be reported as xfail (not xpass) 
							
						 
						
							2012-06-19 23:48:39 +02:00  
				
					
						
							
							
								 
						
							
								6155e9139d 
								
							 
						 
						
							
							
								
								hande the trial todo class by using repr  
							
							
							
						 
						
							2012-05-10 01:38:13 +02:00  
				
					
						
							
							
								 
						
							
								58933aac2a 
								
							 
						 
						
							
							
								
								try to better handle @unittest.expectedFailure decorator  
							
							
							
						 
						
							2012-03-19 22:53:52 -07:00  
				
					
						
							
							
								 
						
							
								bc8ee95e72 
								
							 
						 
						
							
							
								
								add ini-file "markers" option and a cmdline option "--markers" to show defined markers.  Add "skipif", "xfail" etc. to the set of builtin markers shown with the --markers option.  
							
							
							
						 
						
							2011-11-11 22:56:11 +00:00  
				
					
						
							
							
								 
						
							
								6ac638ba87 
								
							 
						 
						
							
							
								
								add a reportchar for reporting errors,  fixes   #76  
							
							
							
						 
						
							2011-09-29 23:44:26 +02:00  
				
					
						
							
							
								 
						
							
								070c73ff2f 
								
							 
						 
						
							
							
								
								fix issue30 (the second time)  
							
							... 
							
							
							
							put module globals into namespace for xfail and skipif expressions 
							
						 
						
							2011-03-03 23:22:55 +01:00  
				
					
						
							
							
								 
						
							
								682773e0cb 
								
							 
						 
						
							
							
								
								fix issue30 - better handling and reporting of errors in xfail expressions  
							
							
							
						 
						
							2011-03-03 12:19:17 +01:00  
				
					
						
							
							
								 
						
							
								513482f4f7 
								
							 
						 
						
							
							
								
								fix issue9 wrong XPass with failing setup/teardown function of xfail marked test  
							
							... 
							
							
							
							now when setup or teardown of a test item/function fails and the test
is marked "xfail" it will show up as an xfail-ed test. 
							
						 
						
							2010-12-06 18:20:47 +01:00  
				
					
						
							
							
								 
						
							
								82ba645a2e 
								
							 
						 
						
							
							
								
								fix skip reporting over distributed testing.  if we have a "skip" report  
							
							... 
							
							
							
							rep.longrepr will now be a 3-tuple (path, lineno, message) 
							
						 
						
							2010-11-13 21:03:28 +01:00  
				
					
						
							
							
								 
						
							
								929291775e 
								
							 
						 
						
							
							
								
								flat is better than nested (cont'd):  
							
							... 
							
							
							
							- pytest.py is new module, making "python -m pytest" work always
- _pytest/*.py now contains core.py, hookspec and the plugins, no sub packages 
							
						 
						
							2010-11-13 11:10:45 +01:00