6951da7da0 
								
							 
						 
						
							
							
								
								merge Ronny's changes, add some documentation and changelog entries  
							
							... 
							
							
							
							--HG--
branch : trunk 
							
						 
						
							2010-06-09 14:26:08 +02:00  
				
					
						
							
							
								 
						
							
								d1c8209875 
								
							 
						 
						
							
							
								
								support using py.test.raises in context manager style  
							
							... 
							
							
							
							--HG--
branch : trunk 
							
						 
						
							2010-06-09 10:50:00 +02:00  
				
					
						
							
							
								 
						
							
								64388832d9 
								
							 
						 
						
							
							
								
								introduce a new request.applymarker() function and refactor  
							
							... 
							
							
							
							internally to allow for dynamically adding keywords to test
items.
--HG--
branch : trunk 
							
						 
						
							2010-06-08 02:34:51 +02:00  
				
					
						
							
							
								 
						
							
								804dcd3521 
								
							 
						 
						
							
							
								
								some adjustments to make py.test --basetemp=XYZ work where  
							
							... 
							
							
							
							XYZ is a subdir the checkout which contains a conftest.py
--HG--
branch : trunk 
							
						 
						
							2010-06-07 21:02:26 +02:00  
				
					
						
							
							
								 
						
							
								c1d0fc9aaf 
								
							 
						 
						
							
							
								
								add ignore_errors to local.remove()  
							
							... 
							
							
							
							--HG--
branch : trunk 
							
						 
						
							2010-06-07 20:48:36 +02:00  
				
					
						
							
							
								 
						
							
								10b8de060a 
								
							 
						 
						
							
							
								
								fix py.code.compile to generate unique filenames  
							
							... 
							
							
							
							--HG--
branch : trunk 
							
						 
						
							2010-06-06 19:08:22 +02:00  
				
					
						
							
							
								 
						
							
								10baa7f8af 
								
							 
						 
						
							
							
								
								fix python3 failure by making a relative import work  
							
							... 
							
							
							
							--HG--
branch : trunk 
							
						 
						
							2010-06-05 16:10:17 +02:00  
				
					
						
							
							
								 
						
							
								c56f4f9444 
								
							 
						 
						
							
							
								
								don't depend on (and don't actually use anymore) testing/__init__.py  
							
							... 
							
							
							
							--HG--
branch : trunk 
							
						 
						
							2010-06-04 00:39:58 +02:00  
				
					
						
							
							
								 
						
							
								f8404be1b2 
								
							 
						 
						
							
							
								
								add a rootdir param to py.path.local.mkdtemp  
							
							... 
							
							
							
							--HG--
branch : trunk 
							
						 
						
							2010-06-03 11:14:32 +02:00  
				
					
						
							
							
								 
						
							
								a07e494554 
								
							 
						 
						
							
							
								
								add kwarg support to py.errpr.checked_call  
							
							... 
							
							
							
							--HG--
branch : trunk 
							
						 
						
							2010-06-03 10:21:48 +02:00  
				
					
						
							
							
								 
						
							
								75d80ca183 
								
							 
						 
						
							
							
								
								fix pyimport() bug on directories  
							
							... 
							
							
							
							--HG--
branch : trunk 
							
						 
						
							2010-05-31 17:06:46 +02:00  
				
					
						
							
							
								 
						
							
								b66b5e2715 
								
							 
						 
						
							
							
								
								fix issue 57 - make --looponfail work with xpassing tests  
							
							... 
							
							
							
							--HG--
branch : trunk 
							
						 
						
							2010-05-26 18:55:50 +02:00  
				
					
						
							
							
								 
						
							
								c953c7d313 
								
							 
						 
						
							
							
								
								fix issue102 by introducing a --maxfailures=NUM option  
							
							... 
							
							
							
							also print an informative line about "stopped/interrupted" test runs
near the end.
--HG--
branch : trunk 
							
						 
						
							2010-05-25 16:52:09 +02:00  
				
					
						
							
							
								 
						
							
								fa074da5a9 
								
							 
						 
						
							
							
								
								when --runxfail is supplied also show tracebacks when running a test that  
							
							... 
							
							
							
							calls py.test.xfail
--HG--
branch : trunk 
							
						 
						
							2010-05-22 17:08:49 +02:00  
				
					
						
							
							
								 
						
							
								29a5b7452e 
								
							 
						 
						
							
							
								
								* improve and test --tb=short reporting  
							
							... 
							
							
							
							* show --tb=short tracebacks for importing test modules
--HG--
branch : trunk 
							
						 
						
							2010-05-22 16:18:24 +02:00  
				
					
						
							
							
								 
						
							
								93712a3ce6 
								
							 
						 
						
							
							
								
								terser reporting header  
							
							... 
							
							
							
							--HG--
branch : trunk 
							
						 
						
							2010-05-22 13:59:01 +02:00  
				
					
						
							
							
								 
						
							
								4f7ef0b63f 
								
							 
						 
						
							
							
								
								fix issue89 - allow py.test.mark decorators to be used with classes  
							
							... 
							
							
							
							(if you are using >=python2.6)
also allow to have multiple markers applied at class level
and test and fix a bug with chained skip/xfail decorators:
if any of the conditions is true a test will be skipped/xfailed
with a explanation which condition evaluated to true.
--HG--
branch : trunk 
							
						 
						
							2010-05-21 18:11:47 +02:00  
				
					
						
							
							
								 
						
							
								578cba20d4 
								
							 
						 
						
							
							
								
								fix issue94 make reporting more robust against bogus source code  
							
							... 
							
							
							
							(and internally be more careful when presenting unexpected byte sequences)
also make py.code.Source accept a list of lines directly.
--HG--
branch : trunk 
							
						 
						
							2010-05-21 16:42:46 +02:00  
				
					
						
							
							
								 
						
							
								93f91c9607 
								
							 
						 
						
							
							
								
								unify handling of reportcharacters across resultlog/junitxml plugins  
							
							... 
							
							
							
							--HG--
branch : trunk 
							
						 
						
							2010-05-20 14:35:13 +02:00  
				
					
						
							
							
								 
						
							
								925f75088d 
								
							 
						 
						
							
							
								
								fix issue91 introduce new py.test.xfail(reason) helper  
							
							... 
							
							
							
							to imperatively mark a test as expected to fail. Can
be used from within setup and test functions. This is
useful especially for parametrized tests when certain
configurations are expected-to-fail.  In this case the
declarative approach with the @py.test.mark.xfail cannot
be used as it would mark all configurations as xfail.
--HG--
branch : trunk 
							
						 
						
							2010-05-20 13:29:51 +02:00  
				
					
						
							
							
								 
						
							
								eac0345689 
								
							 
						 
						
							
							
								
								fix wrong test invocation  
							
							... 
							
							
							
							--HG--
branch : trunk 
							
						 
						
							2010-05-19 17:05:13 +02:00  
				
					
						
							
							
								 
						
							
								20424a9c76 
								
							 
						 
						
							
							
								
								fix and test "-rP" option to show xpass-test ids  
							
							... 
							
							
							
							--HG--
branch : trunk 
							
						 
						
							2010-05-19 16:52:03 +02:00  
				
					
						
							
							
								 
						
							
								2229d2d947 
								
							 
						 
						
							
							
								
								revert 1735 - fix issue95 differently: just shift the offending zlib  
							
							... 
							
							
							
							import (and others) to happen when they are actually needed
--HG--
branch : trunk 
							
						 
						
							2010-05-19 16:42:22 +02:00  
				
					
						
							
							
								 
						
							
								c3bd29b490 
								
							 
						 
						
							
							
								
								fix issue95 - treat a failing pytest_genscript import  
							
							... 
							
							
							
							as non-critical, give a hint.
--HG--
branch : trunk 
							
						 
						
							2010-05-19 16:22:23 +02:00  
				
					
						
							
							
								 
						
							
								cf255cd643 
								
							 
						 
						
							
							
								
								some special handling of stdin capturing, unification, un-xfail the win32 test  
							
							... 
							
							
							
							--HG--
branch : trunk 
							
						 
						
							2010-05-18 12:12:34 -07:00  
				
					
						
							
							
								 
						
							
								10296faff1 
								
							 
						 
						
							
							
								
								for now don't test close(0) on windows - it hangs there  
							
							... 
							
							
							
							--HG--
branch : trunk 
							
						 
						
							2010-05-18 11:43:22 -07:00  
				
					
						
							
							
								 
						
							
								9f5e6f9761 
								
							 
						 
						
							
							
								
								simplify and unify FDCapture API and usage:  
							
							... 
							
							
							
							* FDCapture now takes care through the 'patchsys' option to
  also set sys.stdin/out/err - setfiles/unsetfiles methods removed -
  i doubt anybody uses this outside of py.test's own old usage.
* stdin also goes through FDCapture now.
--HG--
branch : trunk 
							
						 
						
							2010-05-18 20:03:44 +02:00  
				
					
						
							
							
								 
						
							
								da097c9d67 
								
							 
						 
						
							
							
								
								deal gracefully with invalid file descriptors - don't capture the particular stream  
							
							... 
							
							
							
							--HG--
branch : trunk 
							
						 
						
							2010-05-18 16:52:56 +02:00  
				
					
						
							
							
								 
						
							
								4f5d7948f7 
								
							 
						 
						
							
							
								
								- try to fix the nightly failures by refining internal capturing mechanism  
							
							... 
							
							
							
							and adding tests, including a "lsof" test for making sure the number of
  open file descriptors does not increase.
- also move a py.io related logging test to testing/io
--HG--
branch : trunk 
							
						 
						
							2010-05-18 16:01:58 +02:00  
				
					
						
							
							
								 
						
							
								1a97c59439 
								
							 
						 
						
							
							
								
								fix test to account for earlier capfd skipping (on jython)  
							
							... 
							
							
							
							--HG--
branch : trunk 
							
						 
						
							2010-05-18 09:54:04 +02:00  
				
					
						
							
							
								 
						
							
								e71685736e 
								
							 
						 
						
							
							
								
								fix issue96 - make capturing more resilient against KeyboardInterrupt  
							
							... 
							
							
							
							--HG--
branch : trunk 
							
						 
						
							2010-05-17 19:00:39 +02:00  
				
					
						
							
							
								 
						
							
								f97e082543 
								
							 
						 
						
							
							
								
								fix test to work on jython and cpy  
							
							... 
							
							
							
							--HG--
branch : trunk 
							
						 
						
							2010-05-14 15:25:24 +02:00  
				
					
						
							
							
								 
						
							
								91880ffc19 
								
							 
						 
						
							
							
								
								adding three x-failing tests for issue88, issue93 and related issues  
							
							... 
							
							
							
							--HG--
branch : trunk 
							
						 
						
							2010-05-14 12:02:43 +02:00  
				
					
						
							
							
								 
						
							
								169d8d1e54 
								
							 
						 
						
							
							
								
								fix test to account for jython python file ending  
							
							... 
							
							
							
							--HG--
branch : trunk 
							
						 
						
							2010-05-12 14:12:07 +02:00  
				
					
						
							
							
								 
						
							
								379390a8aa 
								
							 
						 
						
							
							
								
								remove code.new() function and store lines directly into linecache.cache instead.  
							
							... 
							
							
							
							This avoids the need for custom code objects, improving compatibility for jython
and pypy-c.
--HG--
branch : trunk 
							
						 
						
							2010-05-11 22:54:04 +02:00  
				
					
						
							
							
								 
						
							
								8ba2a98e11 
								
							 
						 
						
							
							
								
								allow to run py.test.cmdline.main() multiple times.  
							
							... 
							
							
							
							--HG--
branch : trunk 
							
						 
						
							2010-05-11 19:56:22 +02:00  
				
					
						
							
							
								 
						
							
								ee036223ce 
								
							 
						 
						
							
							
								
								deprecate --report option in favour of a new shorter and easier to remember -r option: this takes a string argument consisting of any combination of 'xsfX'  
							
							... 
							
							
							
							Those letters basically correspond to the letters you see during terminal reporting.
--HG--
branch : trunk 
							
						 
						
							2010-05-05 19:50:59 +02:00  
				
					
						
							
							
								 
						
							
								c933ada7fb 
								
							 
						 
						
							
							
								
								new --runxfail option to ignore xfail markers on functions  
							
							... 
							
							
							
							--HG--
branch : trunk 
							
						 
						
							2010-05-04 13:02:27 +02:00  
				
					
						
							
							
								 
						
							
								28150c7486 
								
							 
						 
						
							
							
								
								add unit-tests for xfail and refine xfail handling and reporting  
							
							... 
							
							
							
							--HG--
branch : trunk 
							
						 
						
							2010-05-04 12:37:56 +02:00  
				
					
						
							
							
								 
						
							
								dd7fd97810 
								
							 
						 
						
							
							
								
								add a terminalreporter.testid method  
							
							... 
							
							
							
							--HG--
branch : trunk 
							
						 
						
							2010-05-04 12:37:52 +02:00  
				
					
						
							
							
								 
						
							
								1a8b2838fa 
								
							 
						 
						
							
							
								
								add new parameters:  
							
							... 
							
							
							
							xfail(run=False) will not run expected-to-fail tests
xfail(reason=True) will report the specified reason
--HG--
branch : trunk 
							
						 
						
							2010-05-02 22:13:16 +02:00  
				
					
						
							
							
								 
						
							
								82d4aae571 
								
							 
						 
						
							
							
								
								some internal fixes regarding the new required hook-finding prefix  
							
							... 
							
							
							
							--HG--
branch : trunk 
							
						 
						
							2010-05-02 17:10:38 +02:00  
				
					
						
							
							
								 
						
							
								fd473d4002 
								
							 
						 
						
							
							
								
								refine and test new hook registration, now it is called "pytest_addhooks"  
							
							... 
							
							
							
							similar to pytest_addoption and raises on bogus input.
--HG--
branch : trunk 
							
						 
						
							2010-05-02 16:36:53 +02:00  
				
					
						
							
							
								 
						
							
								45e10f4c48 
								
							 
						 
						
							
							
								
								rename pytest_ignore_collect_path to pytest_ignore_collect before release  
							
							... 
							
							
							
							--HG--
branch : trunk 
							
						 
						
							2010-05-02 15:24:02 +02:00  
				
					
						
							
							
								 
						
							
								b3ce06bbf9 
								
							 
						 
						
							
							
								
								add close method to DontReadFromInput so multiprocessing can close it  
							
							... 
							
							
							
							--HG--
branch : trunk 
							
						 
						
							2010-04-29 19:46:43 +02:00  
				
					
						
							
							
								 
						
							
								962d0fe2be 
								
							 
						 
						
							
							
								
								introduce new pytest_pycollect_makemodule(path, parent) hook for  
							
							... 
							
							
							
							allowing customization of the Module collection object for a matching test module.
--HG--
branch : trunk 
							
						 
						
							2010-04-29 16:53:29 +02:00  
				
					
						
							
							
								 
						
							
								811408959f 
								
							 
						 
						
							
							
								
								introduce a new pytest_ignore_collect_path(path, config) hook -  
							
							... 
							
							
							
							returning a true value will prevent considering the path for collection
The hook is called for both files and directory paths.
--HG--
branch : trunk 
							
						 
						
							2010-04-29 16:20:55 +02:00  
				
					
						
							
							
								 
						
							
								5ece3858e4 
								
							 
						 
						
							
							
								
								introduce new py.io.saferepr for printing the 'repr' of an object safely  
							
							... 
							
							
							
							and without consuming too much space
--HG--
branch : trunk 
							
						 
						
							2010-04-29 14:17:07 +02:00  
				
					
						
							
							
								 
						
							
								1c1623885f 
								
							 
						 
						
							
							
								
								fix a py3k related skip - py.io.TextIO on py3k should probably  
							
							... 
							
							
							
							not allow to write bytes to it.
--HG--
branch : trunk 
							
						 
						
							2010-04-29 10:50:20 +02:00  
				
					
						
							
							
								 
						
							
								5dc66bb4ca 
								
							 
						 
						
							
							
								
								make py.io.ansi_print and py.io.get_terminal_width() directly available.  
							
							... 
							
							
							
							--HG--
branch : trunk 
							
						 
						
							2010-04-29 10:49:50 +02:00