0be97624b7 
								
							 
						 
						
							
							
								
								Fixed E121 flake8 errors  
							
							... 
							
							
							
							continuation line under-indented for hanging indent 
							
						 
						
							2017-07-17 01:28:16 +02:00  
				
					
						
							
							
								 
						
							
								6af2abdb53 
								
							 
						 
						
							
							
								
								Fixed flake8 warnings  
							
							... 
							
							
							
							W191 indentation contains tabs
W292 no newline at end of file
W293 blank line contains whitespace
W391 blank line at end of file 
							
						 
						
							2017-07-17 01:28:16 +02:00  
				
					
						
							
							
								 
						
							
								e5169a026a 
								
							 
						 
						
							
							
								
								#2574 : --fixtures, --fixtures-per-test keep indentation of docstring  
							
							
							
						 
						
							2017-07-15 13:33:11 +02:00  
				
					
						
							
							
								 
						
							
								4e4ebbef5a 
								
							 
						 
						
							
							
								
								Improve test to ensure the expected function is re-raised  
							
							
							
						 
						
							2017-06-13 20:16:48 -03:00  
				
					
						
							
							
								 
						
							
								5a856b6e29 
								
							 
						 
						
							
							
								
								handle and reraise subrequest finalizer exceptions  
							
							
							
						 
						
							2017-06-12 21:26:42 -04:00  
				
					
						
							
							
								 
						
							
								fa56114115 
								
							 
						 
						
							
							
								
								Clean up warnings generated by pytest's own suite  
							
							
							
						 
						
							2017-03-20 22:13:17 -03:00  
				
					
						
							
							
								 
						
							
								fb0b90646e 
								
							 
						 
						
							
							
								
								New-style classes implemented for python 2.7 -  #2147  
							
							
							
						 
						
							2017-02-16 20:28:17 +01:00  
				
					
						
							
							
								 
						
							
								522d59e844 
								
							 
						 
						
							
							
								
								Use session.config.hook instead of ihook.  Fixes   #2124  
							
							
							
						 
						
							2016-12-10 16:45:40 +06: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  
				
					
						
							
							
								 
						
							
								6db2f315fa 
								
							 
						 
						
							
							
								
								Explain a bad scope value to the user  
							
							
							
						 
						
							2016-09-21 16:40:58 -04:00  
				
					
						
							
							
								 
						
							
								463e6572c5 
								
							 
						 
						
							
							
								
								Merge branch 'master' into merge-master-into-features  
							
							... 
							
							
							
							Preparing for 3.0 
							
						 
						
							2016-08-17 22:39:23 -03:00  
				
					
						
							
							
								 
						
							
								707b6b5e3f 
								
							 
						 
						
							
							
								
								Revert all invocation-fixtures code  
							
							... 
							
							
							
							Due to a serious regression found in #1794 , it was decided to pull off
invocation features from 3.0 so it can be (hopefully) re-introduced
in 3.1 
							
						 
						
							2016-08-17 08:12:55 -03:00  
				
					
						
							
							
								 
						
							
								c163cc7937 
								
							 
						 
						
							
							
								
								Improve display of continuation lines with multiline errors  
							
							... 
							
							
							
							Fixes https://github.com/pytest-dev/pytest/issues/717 .
Follow-up to https://github.com/pytest-dev/pytest/pull/1762 . 
							
						 
						
							2016-08-14 22:34:31 +02:00  
				
					
						
							
							
								 
						
							
								277b6d3974 
								
							 
						 
						
							
							
								
								Sort fixture names when a fixture lookup error occurs  
							
							
							
						 
						
							2016-08-02 19:45:31 -03:00  
				
					
						
							
							
								 
						
							
								553dc2600f 
								
							 
						 
						
							
							
								
								Strip invocation-scope suffix when displaying fixture lookup error  
							
							
							
						 
						
							2016-08-01 20:34:56 -03:00  
				
					
						
							
							
								 
						
							
								44ecf2ab2f 
								
							 
						 
						
							
							
								
								invocation-scoped fixtures show up once with --fixtures  
							
							
							
						 
						
							2016-08-01 18:48:29 -03:00  
				
					
						
							
							
								 
						
							
								510a6083ba 
								
							 
						 
						
							
							
								
								Merge pull request  #1758  from nicoddemus/deprecated-module  
							
							... 
							
							
							
							Add deprecation module to centralize deprecation messages and bits of… 
							
						 
						
							2016-07-28 22:36:55 +01:00  
				
					
						
							
							
								 
						
							
								c2864aba3d 
								
							 
						 
						
							
							
								
								Merge branch 'master' into merge-master  
							
							... 
							
							
							
							# Conflicts:
#	AUTHORS
#	CHANGELOG.rst
#	_pytest/monkeypatch.py
#	_pytest/python.py 
							
						 
						
							2016-07-25 19:06:29 -03:00  
				
					
						
							
							
								 
						
							
								6c8b0a28e1 
								
							 
						 
						
							
							
								
								Add deprecation module to centralize deprecation messages and bits of code  
							
							
							
						 
						
							2016-07-25 18:14:39 -03:00  
				
					
						
							
							
								 
						
							
								5c5d7e05f7 
								
							 
						 
						
							
							
								
								Followup to  #1718 : style/formatting  
							
							
							
						 
						
							2016-07-24 00:21:42 +02:00  
				
					
						
							
							
								 
						
							
								1704b7d265 
								
							 
						 
						
							
							
								
								Test case for overriding autouse fixtures  
							
							... 
							
							
							
							Test case for overriding autouse fixture with a parametrized fixture.
The test covers the problem explained in the issue 1601
Adding Diego Russo to AUTHORS 
							
						 
						
							2016-07-23 16:53:39 +02:00  
				
					
						
							
							
								 
						
							
								22bb43413f 
								
							 
						 
						
							
							
								
								Added confcutdir in testing/test_conftest.py::test_conftest_import_order and  
							
							... 
							
							
							
							testing/python/fixture.py::TestAutouseManagement::()::
  test_class_function_parametrization_finalization to avoid problems with
  abandoned conftest.py files in /tmp dir.
  Fixes  #1536  
							
						 
						
							2016-07-14 18:15:38 +02:00  
				
					
						
							
							
								 
						
							
								458ecae1df 
								
							 
						 
						
							
							
								
								Replace all usages of "pytest_funcarg__" for @pytest.fixture  
							
							
							
						 
						
							2016-07-11 22:21:52 -03:00  
				
					
						
							
							
								 
						
							
								8c49561470 
								
							 
						 
						
							
							
								
								split most fixture related code into own plugin  
							
							
							
						 
						
							2016-07-09 20:36:00 +02:00  
				
					
						
							
							
								 
						
							
								b9a91dc112 
								
							 
						 
						
							
							
								
								merge from master to features  
							
							
							
						 
						
							2016-07-06 11:51:48 +02:00  
				
					
						
							
							
								 
						
							
								df9918eda3 
								
							 
						 
						
							
							
								
								issue1625, name getfuncargvalue to getfixturevalue  
							
							
							
						 
						
							2016-06-24 10:08:19 +02:00  
				
					
						
							
							
								 
						
							
								18ef7de96b 
								
							 
						 
						
							
							
								
								merge from master again  
							
							
							
						 
						
							2016-06-22 16:03:52 +02:00  
				
					
						
							
							
								 
						
							
								083f64100d 
								
							 
						 
						
							
							
								
								merge master into features  
							
							
							
						 
						
							2016-06-22 14:39:33 +02:00  
				
					
						
							
							
								 
						
							
								7d87a1b127 
								
							 
						 
						
							
							
								
								Add test for failing assertion  
							
							... 
							
							
							
							Should contain function name that caused the failure (see pull request #1631 ). 
							
						 
						
							2016-06-22 11:23:50 +02:00  
				
					
						
							
							
								 
						
							
								5854a71ece 
								
							 
						 
						
							
							
								
								Issue 460: getfuncargvalue fixture w. params err  
							
							
							
						 
						
							2016-06-21 11:29:21 +02:00  
				
					
						
							
							
								 
						
							
								d712428d33 
								
							 
						 
						
							
							
								
								Fix custom name for yield_fixtures  
							
							
							
						 
						
							2016-06-08 21:07:49 -03:00  
				
					
						
							
							
								 
						
							
								366879db27 
								
							 
						 
						
							
							
								
								Make normal fixtures work with "yield"  
							
							
							
						 
						
							2016-06-08 21:07:47 -03:00  
				
					
						
							
							
								 
						
							
								b5bd4d959d 
								
							 
						 
						
							
							
								
								merge master to features  
							
							
							
						 
						
							2016-06-01 08:13:26 +02:00  
				
					
						
							
							
								 
						
							
								fb8ad714b1 
								
							 
						 
						
							
							
								
								Implement a test for showfixtures to show fixtures with same name  
							
							
							
						 
						
							2016-05-31 11:47:16 +01:00  
				
					
						
							
							
								 
						
							
								9577120592 
								
							 
						 
						
							
							
								
								Allow custom fixture names for fixtures  
							
							... 
							
							
							
							When defining a fixture in the same module as where it is used, the
function argument shadows the fixture name, which a) annoys pylint and
b) can lead to bugs where you forget to request a fixture into a test
method.
This allows one to define fixtures with a different name than the name
of the function, bypassing that problem. 
							
						 
						
							2016-03-09 14:58:54 -08:00  
				
					
						
							
							
								 
						
							
								a912d3745b 
								
							 
						 
						
							
							
								
								Moved py.code code over to py.test  
							
							... 
							
							
							
							Fix  #103  
						
							2016-01-25 23:18:04 -02:00  
				
					
						
							
							
								 
						
							
								19791546da 
								
							 
						 
						
							
							
								
								Add docstring.  
							
							
							
						 
						
							2015-08-31 15:11:57 +02:00  
				
					
						
							
							
								 
						
							
								885e461ae3 
								
							 
						 
						
							
							
								
								Fix overriding of fixtures with parametrization.  
							
							... 
							
							
							
							Fixes  #979 , see #926 . 
						
							2015-08-31 14:38:39 +02:00  
				
					
						
							
							
								 
						
							
								41cef6f5f2 
								
							 
						 
						
							
							
								
								Don't skip fixtures that are substrings of params  
							
							... 
							
							
							
							Bug introduced with
https://bitbucket.org/pytest-dev/pytest/pull-requests/257/allow-to-override-parametrized-fixtures 
Fix  #736  
							
						 
						
							2015-08-11 00:41:21 +02:00  
				
					
						
							
							
								 
						
							
								df29120abe 
								
							 
						 
						
							
							
								
								Merge branch 'pytest-2.7'  
							
							... 
							
							
							
							Conflicts:
	_pytest/config.py
	_pytest/genscript.py
	_pytest/mark.py
	tox.ini 
							
						 
						
							2015-07-23 22:35:51 -03:00  
				
					
						
							
							
								 
						
							
								6af7172204 
								
							 
						 
						
							
							
								
								Merge branch 'pytest-2.7'  
							
							
							
						 
						
							2015-07-19 15:25:04 +02:00  
				
					
						
							
							
								 
						
							
								2f7d0f8bd9 
								
							 
						 
						
							
							
								
								Consider --color option in more places which deal with TerminalWriters  
							
							
							
						 
						
							2015-07-18 16:39:55 -03:00  
				
					
						
							
							
								 
						
							
								0f52856f99 
								
							 
						 
						
							
							
								
								Use a subdirectory in the TEMP directory to speed up tmpdir creation  
							
							... 
							
							
							
							Fix  #105  
						
							2015-07-15 20:03:58 -03:00  
				
					
						
							
							
								 
						
							
								5ec2a17f08 
								
							 
						 
						
							
							
								
								--fixtures only shows fixtures from first file  
							
							... 
							
							
							
							Fix  #833  
						
							2015-07-12 17:32:39 -03:00  
				
					
						
							
							
								 
						
							
								9aec5cd52d 
								
							 
						 
						
							
							
								
								use runpytest() instead of runpytest_inprocess if a test can run as subprocess as well  
							
							... 
							
							
							
							--HG--
branch : testrefactor 
							
						 
						
							2015-04-28 12:05:08 +02:00  
				
					
						
							
							
								 
						
							
								db5649ec6a 
								
							 
						 
						
							
							
								
								streamline pytester API majorly:  
							
							... 
							
							
							
							- integrate conftest into pytester plugin
- introduce runpytest() to either call runpytest_inline (default) or
  runpytest_subprocess (python -m pytest)
- move testdir.inline_runsource1 to pdb tests
- strike some unneccessary methods.
- a new section "writing plugins" and some better pytester docs
--HG--
branch : testrefactor 
							
						 
						
							2015-04-28 11:54:53 +02:00  
				
					
						
							
							
								 
						
							
								a8afba054a 
								
							 
						 
						
							
							
								
								- refine lsof checking  
							
							... 
							
							
							
							- make runpytest() create an inline testing process instead of
  a subprocess one
--HG--
branch : testrefactor 
							
						 
						
							2015-04-28 11:54:46 +02:00  
				
					
						
							
							
								 
						
							
								d3e363b97a 
								
							 
						 
						
							
							
								
								- make API between runpytest() and inline_run() more similar  
							
							... 
							
							
							
							- shift a number of tests to become inline_run() tests
--HG--
branch : testrefactor 
							
						 
						
							2015-04-28 11:54:45 +02:00  
				
					
						
							
							
								 
						
							
								d632a0d5c2 
								
							 
						 
						
							
							
								
								merge conftest management into PytestPluginManager  
							
							... 
							
							
							
							--HG--
branch : plugin_no_pytest 
							
						 
						
							2015-04-22 14:15:42 +02:00  
				
					
						
							
							
								 
						
							
								3ed3e51997 
								
							 
						 
						
							
							
								
								fix issue660: properly report fixture scope mismatches independent  
							
							... 
							
							
							
							from fixture argument ordering.
--HG--
branch : issue660 
							
						 
						
							2015-04-01 18:42:48 +02:00  
				
					
						
							
							
								 
						
							
								d2a8866bce 
								
							 
						 
						
							
							
								
								bump verrsion to python2.7, fix a too precise test for windows, regen docs  
							
							
							
						 
						
							2015-03-26 09:34:10 +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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								2d7a32f7ea 
								
							 
						 
						
							
							
								
								Add test case for using different modules  
							
							
							
						 
						
							2014-07-18 01:30:29 +01:00  
				
					
						
							
							
								 
						
							
								115f15600f 
								
							 
						 
						
							
							
								
								Add test for inter-dependent fixtures  
							
							... 
							
							
							
							Together with cc0a46a13ac4 this fixes issue 467. 
							
						 
						
							2014-06-15 19:57:52 +01: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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								86284689a3 
								
							 
						 
						
							
							
								
								simplify loop which turns direct funcarg parametrization to indirect  
							
							
							
						 
						
							2014-01-27 12:53:44 +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  
				
					
						
							
							
								 
						
							
								7766526992 
								
							 
						 
						
							
							
								
								address issue122 -- explode "params" into a list in fixture function decorators  
							
							
							
						 
						
							2013-12-09 10:48:15 +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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								bb5f1e8173 
								
							 
						 
						
							
							
								
								refactor internal FixtureRequest handling to avoid monkeypatching.  
							
							... 
							
							
							
							One of the positive user-facing effects is that the "request" object
can now be used in closures. 
							
						 
						
							2013-11-21 12:21:52 +01:00  
				
					
						
							
							
								 
						
							
								05fbd490da 
								
							 
						 
						
							
							
								
								addresses issue246: add a test for module/function scope that shows that  
							
							... 
							
							
							
							finalizer ordering is wrong. 
							
						 
						
							2013-11-21 09:42:24 +01:00  
				
					
						
							
							
								 
						
							
								5322f057a0 
								
							 
						 
						
							
							
								
								move two fixture test modules into bigger testing/python/fixture.py  
							
							
							
						 
						
							2013-11-21 09:26:45 +01:00  
				
					
						
							
							
								 
						
							
								8ac5af2896 
								
							 
						 
						
							
							
								
								fix flakes issues and make --flakes run part of tox runs  
							
							
							
						 
						
							2013-10-12 15:39:22 +02:00  
				
					
						
							
							
								 
						
							
								de35b077a2 
								
							 
						 
						
							
							
								
								disallow yield in non-yield-fixtures for now.  This is an incompataibility but we want to prepare for possibly merging fixture and yield_fixture some day.  
							
							
							
						 
						
							2013-09-30 13:56:54 +02:00  
				
					
						
							
							
								 
						
							
								086d4e4ced 
								
							 
						 
						
							
							
								
								strike keyword argument in favour of new pytest.yield_fixture decorator  
							
							
							
						 
						
							2013-09-30 13:42:39 +02:00  
				
					
						
							
							
								 
						
							
								da7133d201 
								
							 
						 
						
							
							
								
								fix some tests wrt to expecting output now that pytest does no  
							
							... 
							
							
							
							introduce unwanted "buffering" on "-s" calls. 
							
						 
						
							2013-09-27 12:28:34 +02:00  
				
					
						
							
							
								 
						
							
								3ab9b48782 
								
							 
						 
						
							
							
								
								introduce yieldctx=True in the @pytest.fixture decorator. Refactor tests and docs.  
							
							
							
						 
						
							2013-09-26 12:57:21 +02:00  
				
					
						
							
							
								 
						
							
								7d86827b5e 
								
							 
						 
						
							
							
								
								ref  #322  cleanup all teardown calling to only happen when setup succeeded.  
							
							... 
							
							
							
							don't use autouse fixtures for now because it would cause a proliferation
and overhead for the execution of every test.  Rather introduce a
node.addfinalizer(fin) to attach a finalizer to the respective node
and call it from node.setup() functions if the setup phase succeeded
(i.e. there is no setup function or it finished successfully) 
							
						 
						
							2013-08-02 09:52:40 +02:00  
				
					
						
							
							
								 
						
							
								7fc0d45a4c 
								
							 
						 
						
							
							
								
								refs  #322 : setUpClass and tearDownClass as autouse fixture and finalizer  
							
							
							
						 
						
							2013-08-01 23:48:40 +02:00  
				
					
						
							
							
								 
						
							
								2cdb54225c 
								
							 
						 
						
							
							
								
								Fix issue 336: autouse fixtures in plugins work again  
							
							... 
							
							
							
							When an autouse fixture in a plugin was encountered None was stored as nodeid
where it used to be ''.  This broke the lookup of autouse fixtures later on.
This also adds another test for the normal fixture ordering which was slightly
wrong: a fixture without location was always added at the front of the fixture
list rather then at the end of the fixtures without location but before the
fixtures with location. 
							
						 
						
							2013-08-01 18:58:28 +01:00  
				
					
						
							
							
								 
						
							
								8f24e10571 
								
							 
						 
						
							
							
								
								add changelog entry for anthon's hynek-fication of options,  
							
							... 
							
							
							
							and change the docs and tests to use the new style. 
							
						 
						
							2013-08-01 17:32:19 +02:00  
				
					
						
							
							
								 
						
							
								1280add047 
								
							 
						 
						
							
							
								
								SO-17664702: call fixture finalizers even if the fixture function  
							
							... 
							
							
							
							partially failed (finalizers would not always be called before) 
							
						 
						
							2013-07-17 10:29:11 +02:00  
				
					
						
							
							
								 
						
							
								589138ea71 
								
							 
						 
						
							
							
								
								re  #320  fallback to test scope if the class-scoped fixture is used in non-class-based test function  
							
							... 
							
							
							
							--HG--
branch : 320-class-scoped-fixture-caching-is-broken-if 
							
						 
						
							2013-07-06 21:30:24 +02:00  
				
					
						
							
							
								 
						
							
								e6a063ee47 
								
							 
						 
						
							
							
								
								Solve fixture ordering when loading plugins from conftest  
							
							... 
							
							
							
							Conftests are plugins with a location attached to them while other
plugins do not have a location.  When ordering fixturedefs those from
plugins without a location need to be listed first. 
							
						 
						
							2013-07-06 17:56:54 +02:00  
				
					
						
							
							
								 
						
							
								2c7613c15c 
								
							 
						 
						
							
							
								
								merge with upstream  
							
							
							
						 
						
							2013-07-06 10:06:12 +02:00  
				
					
						
							
							
								 
						
							
								56aa9962fc 
								
							 
						 
						
							
							
								
								allow fixture functions to be implemented as context managers:  
							
							... 
							
							
							
							@pytest.fixture
def myfix():
    # setup
    yield 1
    # teardown 
							
						 
						
							2013-05-05 14:48:37 +02:00  
				
					
						
							
							
								 
						
							
								c5f9958783 
								
							 
						 
						
							
							
								
								never consider a fixture function for test function collection  
							
							
							
						 
						
							2013-04-29 10:31:51 +02:00  
				
					
						
							
							
								 
						
							
								c93fbb0e57 
								
							 
						 
						
							
							
								
								Load conftest files in the correct order initially  
							
							... 
							
							
							
							When the conftest.py files are looked for intially they got loaded
starting from the subdir ending at the parent dir(s).  Later on during
collection any conftest.py files are loaded starting from the parent
dir ending at the subdir.  Due to how extending fixtures works the
latter is correct as otherwise the wrong fixture will be available.
So this changes the initial conftest loading to start at the root and
go towards the subdir.
This does also affect the order of other hooks, hence the order of the
reporting being different in testing/test_terminal.py. 
							
						 
						
							2013-04-18 12:24:53 +01:00  
				
					
						
							
							
								 
						
							
								570ad36eaf 
								
							 
						 
						
							
							
								
								fix parametrized testid to provide for uniqueness  
							
							
							
						 
						
							2013-02-05 17:41:45 +01:00  
				
					
						
							
							
								 
						
							
								f263f54889 
								
							 
						 
						
							
							
								
								make yielded tests participate in the autouse protocol  
							
							
							
						 
						
							2012-11-19 22:17:59 +01:00  
				
					
						
							
							
								 
						
							
								d66ff7e63e 
								
							 
						 
						
							
							
								
								fix autouse invocation (off-by-one error), relates to issue in moinmoin test suite  
							
							
							
						 
						
							2012-11-19 22:17:55 +01:00  
				
					
						
							
							
								 
						
							
								b940ed11a0 
								
							 
						 
						
							
							
								
								fix issue226 - LIFO ordering for fixture-added teardowns  
							
							
							
						 
						
							2012-11-16 10:03:51 +01:00  
				
					
						
							
							
								 
						
							
								dba2a8bc64 
								
							 
						 
						
							
							
								
								fix issue217 - to support @mock.patch with pytest funcarg-fixtures, also split out python integration tests into python/integration.py and fix nose/mark tests  
							
							
							
						 
						
							2012-11-06 11:04:11 +01:00  
				
					
						
							
							
								 
						
							
								ba9b27fcd3 
								
							 
						 
						
							
							
								
								fix issue215 - refactor test_python.py into multiple files:  
							
							... 
							
							
							
							- python/collect.py cotaining the core collection nodes
- python/fixture.py containing funcargs/fixture code
- python/metafunc.py generate_tests and metafunc usage
- python/raises.py the pytest.raises implementation 
							
						 
						
							2012-11-02 16:04:57 +01:00