d2a8866bce 
								
							 
						 
						
							
							
								
								bump verrsion to python2.7, fix a too precise test for windows, regen docs  
							
							
							
						 
						
							2015-03-26 09:34:10 +01:00  
				
					
						
							
							
								 
						
							
								43e4fcf6dd 
								
							 
						 
						
							
							
								
								Raise specific MarkerError rather than generic ValueError  
							
							... 
							
							
							
							--HG--
branch : issue463 
							
						 
						
							2015-03-23 20:01:58 +01:00  
				
					
						
							
							
								 
						
							
								ac17f20d98 
								
							 
						 
						
							
							
								
								#463  
							
							... 
							
							
							
							Raise a ValueError early if user misspells 'parametrize' as 'parameterize'.
--HG--
branch : issue463 
							
						 
						
							2015-03-21 23:06:25 +01:00  
				
					
						
							
							
								 
						
							
								eead0365b5 
								
							 
						 
						
							
							
								
								Merged in parametrized-fixture-override (pull request  #257 )  
							
							... 
							
							
							
							allow to override parametrized fixtures with non-parametrized ones and vice versa 
							
						 
						
							2015-03-12 09:40:56 -03:00  
				
					
						
							
							
								 
						
							
								5d6b0a59c0 
								
							 
						 
						
							
							
								
								Strip docstrings in output with `--fixtures`  
							
							... 
							
							
							
							Fixes https://bitbucket.org/pytest-dev/pytest/issue/550 .
--HG--
branch : strip-docstrings-from-fixtures 
							
						 
						
							2015-03-04 17:00:24 +01:00  
				
					
						
							
							
								 
						
							
								d083153548 
								
							 
						 
						
							
							
								
								fix typo  
							
							... 
							
							
							
							--HG--
branch : parametrized-fixture-override 
							
						 
						
							2015-03-02 20:18:06 +01:00  
				
					
						
							
							
								 
						
							
								c4623939af 
								
							 
						 
						
							
							
								
								support override of the parametrized fixture on the test level  
							
							... 
							
							
							
							--HG--
branch : parametrized-fixture-override 
							
						 
						
							2015-03-01 15:15:37 +01:00  
				
					
						
							
							
								 
						
							
								060609317a 
								
							 
						 
						
							
							
								
								allow to override parametrized fixtures with non-parametrized ones and vice versa  
							
							... 
							
							
							
							--HG--
branch : parametrized-fixture-override 
							
						 
						
							2015-03-01 13:54:43 +01:00  
				
					
						
							
							
								 
						
							
								5941b2e071 
								
							 
						 
						
							
							
								
								fix issue 655: crude workarounds around python2/3 exception leaks  
							
							
							
						 
						
							2015-01-09 19:55:49 +01:00  
				
					
						
							
							
								 
						
							
								8d19ccb56f 
								
							 
						 
						
							
							
								
								Merged in pfctdayelise/pytest/issue351 (pull request  #161 )  
							
							... 
							
							
							
							Fixes issue351: Add ability to specify parametrize ids as a
callable, to generate custom test ids. + tests, docs
Hg branch merge 
							
						 
						
							2014-10-22 23:18:01 +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  
				
					
						
							
							
								 
						
							
								ab005a4261 
								
							 
						 
						
							
							
								
								Functional tests for id function  
							
							... 
							
							
							
							--HG--
branch : issue351 
							
						 
						
							2014-10-08 00:11:32 +01:00  
				
					
						
							
							
								 
						
							
								b6dcfd4377 
								
							 
						 
						
							
							
								
								fix conftest related fixture visibility issue: when running with a  
							
							... 
							
							
							
							CWD outside a test package pytest would get fixture discovery wrong.
Thanks to Wolfgang Schnerring for figuring out a reproducable example.
--HG--
branch : conftest-nodeid 
							
						 
						
							2014-09-15 12:44:16 +02:00  
				
					
						
							
							
								 
						
							
								4e8438afc8 
								
							 
						 
						
							
							
								
								Simply show the node ID for verbose output  
							
							... 
							
							
							
							This strips the line number, /@\d/, from the verbose output so it is
directly the node ID of the test.  This in turn means no special logic
for accepting the line number as part of the node ID is needed when
parsing the command line. 
							
						 
						
							2014-08-01 00:29:35 +01:00  
				
					
						
							
							
								 
						
							
								0dd378da30 
								
							 
						 
						
							
							
								
								Injection of fixture doesn't work when decorated with unittest.mock.patch  
							
							... 
							
							
							
							This is a continuation of #182 
--HG--
branch : mock-unittest-252 
							
						 
						
							2014-07-26 17:26:18 +02:00  
				
					
						
							
							
								 
						
							
								1641d00cb1 
								
							 
						 
						
							
							
								
								Merge default  
							
							
							
						 
						
							2014-07-18 01:34:08 +01:00  
				
					
						
							
							
								 
						
							
								2d7a32f7ea 
								
							 
						 
						
							
							
								
								Add test case for using different modules  
							
							
							
						 
						
							2014-07-18 01:30:29 +01:00  
				
					
						
							
							
								 
						
							
								07e76cbef2 
								
							 
						 
						
							
							
								
								fix issue364: shorten and enhance tracebacks representation by default.  
							
							... 
							
							
							
							The new "--tb=auto" option (default) will only display long tracebacks
for the first and last entry.  You can get the old behaviour of printing
all entries as long entries with "--tb=long".  Also short entries by
default are now printed very similarly to "--tb=native" ones. 
							
						 
						
							2014-06-29 13:32:53 +02:00  
				
					
						
							
							
								 
						
							
								115f15600f 
								
							 
						 
						
							
							
								
								Add test for inter-dependent fixtures  
							
							... 
							
							
							
							Together with cc0a46a13ac4 this fixes issue 467. 
							
						 
						
							2014-06-15 19:57:52 +01:00  
				
					
						
							
							
								 
						
							
								4e35c00ab0 
								
							 
						 
						
							
							
								
								issue351: Add ability to specify parametrize ids as a callable, to generate custom test ids. + tests, docs  
							
							... 
							
							
							
							--HG--
branch : issue351 
							
						 
						
							2014-04-17 15:08:49 -04:00  
				
					
						
							
							
								 
						
							
								c46e2cbbc7 
								
							 
						 
						
							
							
								
								Cache exception raised in fixtures according to their scope  
							
							... 
							
							
							
							Without this if a session scoped fixture fails it's setup it will
be re-tried each time it is requested.  Especially in case of
skip or failure exceptions this can be undesirable, but caching
makes sense for all exceptions. 
							
						 
						
							2014-04-15 22:22:41 -04:00  
				
					
						
							
							
								 
						
							
								c47835f5ec 
								
							 
						 
						
							
							
								
								Merge pull request  #158 , fixes issue 504  
							
							
							
						 
						
							2014-04-15 11:43:38 -04:00  
				
					
						
							
							
								 
						
							
								faba432996 
								
							 
						 
						
							
							
								
								Improve error message if pytest.raises is used wrongly  
							
							... 
							
							
							
							If the type is not checked then an incomprehensible error will occur
later.  This enforces the type and raies the same exception/msg as
CPython does in that case.
Docstring unmodified, just re-justified for pep8 compat. 
							
						 
						
							2014-04-14 18:09:10 -04:00  
				
					
						
							
							
								 
						
							
								2ba23e8d08 
								
							 
						 
						
							
							
								
								issue504: verbose output displays node IDs for each test  
							
							... 
							
							
							
							Replace the verbose per-test reporting format of `file:line test_name RESULT`
with the node ID of the test, i.e. `file@line::class::method[param] RESULT`.
This patch does not update the examples in the docs; @hpk42 has a script
to regenerate those.
--HG--
branch : issue504 
							
						 
						
							2014-04-14 17:42:02 -04:00  
				
					
						
							
							
								 
						
							
								15af7e1662 
								
							 
						 
						
							
							
								
								fix tests to properly fail on failed collectiosn (which was hiding an error)  
							
							... 
							
							
							
							and also implement __test__=False for test functions properly.
--HG--
branch : nose_test_attr 
							
						 
						
							2014-04-10 13:37:39 +02:00  
				
					
						
							
							
								 
						
							
								e42cbc714f 
								
							 
						 
						
							
							
								
								fix wrong merge  
							
							... 
							
							
							
							--HG--
branch : nose_test_attr 
							
						 
						
							2014-04-10 12:58:10 +02:00  
				
					
						
							
							
								 
						
							
								494be731e3 
								
							 
						 
						
							
							
								
								support nose-style ``__test__`` attribute on modules, classes and  
							
							... 
							
							
							
							functions, including unittest-style Classes.  If set to True, the
test will not be collected.
--HG--
branch : nose_test_attr 
							
						 
						
							2014-04-10 12:46:27 +02:00  
				
					
						
							
							
								 
						
							
								f91049cec9 
								
							 
						 
						
							
							
								
								fix issue473: work around mock putting an unbound method into a class  
							
							... 
							
							
							
							dict when double-patching.
--HG--
branch : issue473 
							
						 
						
							2014-04-08 12:50:13 +02:00  
				
					
						
							
							
								 
						
							
								ef7cb47b1e 
								
							 
						 
						
							
							
								
								fix issue498: if a fixture finalizer fails, make sure that the fixture  
							
							... 
							
							
							
							is still invalidated.
--HG--
branch : issue498 
							
						 
						
							2014-04-07 13:29:57 +02:00  
				
					
						
							
							
								 
						
							
								bb0632c7ad 
								
							 
						 
						
							
							
								
								extend test  
							
							
							
						 
						
							2014-03-26 19:37:49 +01:00  
				
					
						
							
							
								 
						
							
								530cae9204 
								
							 
						 
						
							
							
								
								Merged in cgilling/pytest (pull request  #123 )  
							
							... 
							
							
							
							Fix to work properly when @patch is used with new not equal to DEFAULT 
							
						 
						
							2014-03-26 19:05:46 +01:00  
				
					
						
							
							
								 
						
							
								77e1f93ca1 
								
							 
						 
						
							
							
								
								Fixed pyflakes errors.  
							
							
							
						 
						
							2014-03-14 14:25:36 +01:00  
				
					
						
							
							
								 
						
							
								24db492f53 
								
							 
						 
						
							
							
								
								warn if instances are callable and have a test name  
							
							
							
						 
						
							2014-03-11 22:10:18 +01:00  
				
					
						
							
							
								 
						
							
								3388d82c1c 
								
							 
						 
						
							
							
								
								Fix to work properly when @patch is used with new not equal to DEFAULT  
							
							... 
							
							
							
							also updated test_mock to include this situation 
							
						 
						
							2014-03-03 10:36:59 -08:00  
				
					
						
							
							
								 
						
							
								86284689a3 
								
							 
						 
						
							
							
								
								simplify loop which turns direct funcarg parametrization to indirect  
							
							
							
						 
						
							2014-01-27 12:53:44 +01:00  
				
					
						
							
							
								 
						
							
								41bddb48a1 
								
							 
						 
						
							
							
								
								remove unused var (fixes flakes tests)  
							
							
							
						 
						
							2013-12-16 12:38:15 +01:00  
				
					
						
							
							
								 
						
							
								b4797d6295 
								
							 
						 
						
							
							
								
								fix issue403 : allow same-name parametrized functions within a collector  
							
							
							
						 
						
							2013-12-16 07:47:59 +01:00  
				
					
						
							
							
								 
						
							
								0c737e3de0 
								
							 
						 
						
							
							
								
								Allow parameterised fixtures to give paramemter IDs  
							
							... 
							
							
							
							This is just like the markers etc already can do. 
							
						 
						
							2013-12-15 22:15:15 +00:00  
				
					
						
							
							
								 
						
							
								7b87f7b6b5 
								
							 
						 
						
							
							
								
								Paratrization overrides existing fixtures.  
							
							... 
							
							
							
							--HG--
branch : override-fixture-via-parametrization 
							
						 
						
							2013-12-10 14:27:29 +01:00  
				
					
						
							
							
								 
						
							
								7766526992 
								
							 
						 
						
							
							
								
								address issue122 -- explode "params" into a list in fixture function decorators  
							
							
							
						 
						
							2013-12-09 10:48:15 +01:00  
				
					
						
							
							
								 
						
							
								66ffc5e0f8 
								
							 
						 
						
							
							
								
								backout allowing @pytest.fixture in front of pytest_funcarg__NAME functions.  
							
							... 
							
							
							
							It was introduced because of pylint warnings and it's probably better to
go for a pylint-pytest plugin that avoids also other warnings/issues. 
							
						 
						
							2013-12-09 07:07:47 +01:00  
				
					
						
							
							
								 
						
							
								10edfa65dc 
								
							 
						 
						
							
							
								
								fix issue396 -- properly sort tests using class-scoped parametrization  
							
							... 
							
							
							
							also refix issue323 in a better way to avoid recursion for the fixture-grouping
algorithm alltogether. 
							
						 
						
							2013-12-07 20:55:17 +01:00  
				
					
						
							
							
								 
						
							
								daec4c70b8 
								
							 
						 
						
							
							
								
								refactor sorting wrt class-scopes.  This fixes issue396 and also simplifies  
							
							... 
							
							
							
							the internal sorting algorithm a bit. 
							
						 
						
							2013-12-07 19:31:27 +01:00  
				
					
						
							
							
								 
						
							
								426907eafb 
								
							 
						 
						
							
							
								
								radically simplify eq/neq with nodes by just using Pythons builtin "is" relationship.  
							
							... 
							
							
							
							The need for comparing two separately instantiated nodes seems to be historic
(related to an already-gone mode of pytest-xdist which would re-collect nodes)
and not actually needed anymore. 
							
						 
						
							2013-12-07 16:39:53 +01:00  
				
					
						
							
							
								 
						
							
								4f0879ff9b 
								
							 
						 
						
							
							
								
								refactor internal finalization mechanics such that all fixture arguments  
							
							... 
							
							
							
							in a test invocation will have a corresponding FixtureDef instance.
also fixes issue246 (again).
simplify parametrized fixture teardown by making it work lazy:
during the setup of a parametrized fixture instance any previously
setup instance which was setup with a different param is torn down
before setting up the new one. 
							
						 
						
							2013-12-07 16:37:46 +01:00  
				
					
						
							
							
								 
						
							
								cb485e5af4 
								
							 
						 
						
							
							
								
								reopen   #246  -- it turns out parametrized finalization ordering is not fully fixed -- i modified the test and marked it xfail for now.  
							
							
							
						 
						
							2013-12-04 16:09:37 +01:00  
				
					
						
							
							
								 
						
							
								817b175870 
								
							 
						 
						
							
							
								
								allow to use pytest.fixture decorator on old-style pytest_funcarg__NAME definitions.  
							
							
							
						 
						
							2013-12-04 07:16:34 +01:00  
				
					
						
							
							
								 
						
							
								0cfd873abe 
								
							 
						 
						
							
							
								
								implement index-based mechanizm for collection of parametrized tests  
							
							... 
							
							
							
							--HG--
branch : parametrize-hashable 
							
						 
						
							2013-12-03 21:05:19 +01:00  
				
					
						
							
							
								 
						
							
								d30ad3f5ce 
								
							 
						 
						
							
							
								
								fix reporting for @mock'd test functions  
							
							
							
						 
						
							2013-12-03 11:23:22 +01:00  
				
					
						
							
							
								 
						
							
								e31f40c2d0 
								
							 
						 
						
							
							
								
								fix ordering of finalizers of parametrized interdependent fixtures.  
							
							... 
							
							
							
							This fixes issue246 as reported.  Thanks Ralph Schmitt for the
precise failure example. 
							
						 
						
							2013-11-21 14:16:44 +01:00