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  
				
					
						
							
							
								 
						
							
								d911bfcb8a 
								
							 
						 
						
							
							
								
								Merge branch 'issue634-scopes' of  https://github.com/Stranger6667/pytest  
							
							... 
							
							
							
							# Conflicts:
#	CHANGELOG.rst 
							
						 
						
							2016-07-25 18:26:50 -03:00  
				
					
						
							
							
								 
						
							
								8f29ce26e9 
								
							 
						 
						
							
							
								
								Merge branch 'mark_missing_fixture_error' of  https://github.com/eolo999/pytest  
							
							
							
						 
						
							2016-07-25 18:20:17 -03:00  
				
					
						
							
							
								 
						
							
								6c8b0a28e1 
								
							 
						 
						
							
							
								
								Add deprecation module to centralize deprecation messages and bits of code  
							
							
							
						 
						
							2016-07-25 18:14:39 -03:00  
				
					
						
							
							
								 
						
							
								d72afe7e08 
								
							 
						 
						
							
							
								
								Fixed scope override inside metafunc.parametrize.  Fixes   #634  
							
							
							
						 
						
							2016-07-25 12:42:50 +02:00  
				
					
						
							
							
								 
						
							
								f7ad173fee 
								
							 
						 
						
							
							
								
								Fixed collection of classes with custom ``__new__`` method  
							
							
							
						 
						
							2016-07-25 11:33:37 +02:00  
				
					
						
							
							
								 
						
							
								d000f2536a 
								
							 
						 
						
							
							
								
								added a test for when the indirect is just a string  
							
							
							
						 
						
							2016-07-24 10:47:06 +02:00  
				
					
						
							
							
								 
						
							
								6799a47c78 
								
							 
						 
						
							
							
								
								Start FixtureLookupErrorRepr with an 'E'  
							
							
							
						 
						
							2016-07-23 23:43:34 +02:00  
				
					
						
							
							
								 
						
							
								f26fa5a441 
								
							 
						 
						
							
							
								
								changed error message for unused parametrize name  
							
							
							
						 
						
							2016-07-23 16:49:20 +02:00  
				
					
						
							
							
								 
						
							
								7e37497d5a 
								
							 
						 
						
							
							
								
								Uppercase first word in docstrings. Change to an imperative form. Add name to authors.  
							
							
							
						 
						
							2016-07-22 12:39:06 +02:00  
				
					
						
							
							
								 
						
							
								4f2bf965cb 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/features' into invocation-scoped-fixtures  
							
							
							
						 
						
							2016-07-20 21:16:27 -03:00  
				
					
						
							
							
								 
						
							
								ff8fb4950e 
								
							 
						 
						
							
							
								
								setup_* and teardown_* functions argument now optional  
							
							... 
							
							
							
							setup_module, setup_function and setup_method
extra argument are now optional and may be omitted.
Fix  #1728  
							
						 
						
							2016-07-14 23:41:40 -03:00  
				
					
						
							
							
								 
						
							
								5506dc700c 
								
							 
						 
						
							
							
								
								Deprecate yield tests  
							
							... 
							
							
							
							Closes  #16 
Closes  #1324  
						
							2016-07-11 22:21:49 -03:00  
				
					
						
							
							
								 
						
							
								fb4da00a32 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/features' into invocation-scoped-fixtures  
							
							
							
						 
						
							2016-07-11 20:09:13 -03:00  
				
					
						
							
							
								 
						
							
								775100881a 
								
							 
						 
						
							
							
								
								Implement invocation-scoped fixtures  
							
							
							
						 
						
							2016-07-09 22:52:05 -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  
				
					
						
							
							
								 
						
							
								13a188fe37 
								
							 
						 
						
							
							
								
								Merge pull request  #1647  from sallner/features  
							
							... 
							
							
							
							Add new options to report fixture setup and teardown 
							
						 
						
							2016-06-25 16:38:37 +02:00  
				
					
						
							
							
								 
						
							
								032ce8baf6 
								
							 
						 
						
							
							
								
								Switch setuponly and setupplan options to a hook-based implementation.  
							
							
							
						 
						
							2016-06-25 12:19:46 +02:00  
				
					
						
							
							
								 
						
							
								d81f23009b 
								
							 
						 
						
							
							
								
								Raise CollectError if pytest.skip() is called during collection  
							
							... 
							
							
							
							pytest.skip() must not be used at module level because it can easily be
misunderstood and used as a decorator instead of pytest.mark.skip, causing the
whole module to be skipped instead of just the test being decorated.
This is unexpected for users used to the @unittest.skip decorator and therefore
it is best to bail out with a clean error when it happens.
The pytest equivalent of @unittest.skip is @pytest.mark.skip .
Adapt existing tests that were actually relying on this behaviour and add a
test that explicitly test that collection fails.
fix  #607  
							
						 
						
							2016-06-24 20:56:21 +02:00  
				
					
						
							
							
								 
						
							
								df9918eda3 
								
							 
						 
						
							
							
								
								issue1625, name getfuncargvalue to getfixturevalue  
							
							
							
						 
						
							2016-06-24 10:08:19 +02:00  
				
					
						
							
							
								 
						
							
								c6af737d4e 
								
							 
						 
						
							
							
								
								Fix fixture parameter display when ids is a function  
							
							
							
						 
						
							2016-06-23 10:54:22 +02:00  
				
					
						
							
							
								 
						
							
								1a5e530b98 
								
							 
						 
						
							
							
								
								Fix capturing with --setup-only/--setup-plan  
							
							
							
						 
						
							2016-06-23 10:23:04 +02:00  
				
					
						
							
							
								 
						
							
								dd97a2e7c8 
								
							 
						 
						
							
							
								
								Merge from upstream  
							
							
							
						 
						
							2016-06-22 17:51:48 +02:00  
				
					
						
							
							
								 
						
							
								61992b4e22 
								
							 
						 
						
							
							
								
								Implement --setup-plan option  
							
							
							
						 
						
							2016-06-22 16:45:36 +02:00  
				
					
						
							
							
								 
						
							
								5e0d78f4f1 
								
							 
						 
						
							
							
								
								Fix .format string failures on python 2.6  
							
							
							
						 
						
							2016-06-22 14:53:37 +02:00  
				
					
						
							
							
								 
						
							
								083f64100d 
								
							 
						 
						
							
							
								
								merge master into features  
							
							
							
						 
						
							2016-06-22 14:39:33 +02:00  
				
					
						
							
							
								 
						
							
								2c5c4f3f78 
								
							 
						 
						
							
							
								
								Add printing of fixture dependencies  
							
							
							
						 
						
							2016-06-22 12:54:36 +02:00  
				
					
						
							
							
								 
						
							
								2c6cfa42fa 
								
							 
						 
						
							
							
								
								Disable capturing for setuponly output  
							
							
							
						 
						
							2016-06-22 12:14:35 +02:00  
				
					
						
							
							
								 
						
							
								92bcc36266 
								
							 
						 
						
							
							
								
								Refactor logging of fixtures  
							
							
							
						 
						
							2016-06-22 12:01:51 +02:00  
				
					
						
							
							
								 
						
							
								499c9551c8 
								
							 
						 
						
							
							
								
								Implement working version of --setuponly  
							
							
							
						 
						
							2016-06-22 09:42:45 +02:00  
				
					
						
							
							
								 
						
							
								c3ee1c17bc 
								
							 
						 
						
							
							
								
								Merge pull request  #1620  from tomviner/issue460/parameterized-subrequest  
							
							... 
							
							
							
							Issue 460: Fail on getfuncargvalue(<fixture with params>) 
							
						 
						
							2016-06-21 13:43:06 -03:00  
				
					
						
							
							
								 
						
							
								ef9dd14963 
								
							 
						 
						
							
							
								
								Introduce pytest command as recommended entry point  
							
							... 
							
							
							
							Fixes  #1629  
						
							2016-06-21 16:16:57 +02:00  
				
					
						
							
							
								 
						
							
								2b5c2f3ed5 
								
							 
						 
						
							
							
								
								help the user in the rare case this assertion actually fails  
							
							
							
						 
						
							2016-06-21 14:57:48 +02:00  
				
					
						
							
							
								 
						
							
								5854a71ece 
								
							 
						 
						
							
							
								
								Issue 460: getfuncargvalue fixture w. params err  
							
							
							
						 
						
							2016-06-21 11:29:21 +02:00  
				
					
						
							
							
								 
						
							
								f8d4cadc3d 
								
							 
						 
						
							
							
								
								Added versionchanged directives  
							
							
							
						 
						
							2016-06-19 23:56:43 +03:00  
				
					
						
							
							
								 
						
							
								c29130d400 
								
							 
						 
						
							
							
								
								Updated documentation  
							
							
							
						 
						
							2016-06-19 23:34:42 +03:00  
				
					
						
							
							
								 
						
							
								ca093673fb 
								
							 
						 
						
							
							
								
								pytest.raises accept cutom message only when used as context manager  
							
							
							
						 
						
							2016-06-19 21:24:47 +03:00  
				
					
						
							
							
								 
						
							
								d21886c005 
								
							 
						 
						
							
							
								
								pytest.raises accpets custom message  
							
							
							
						 
						
							2016-06-16 20:15:32 +03:00  
				
					
						
							
							
								 
						
							
								308396ae3c 
								
							 
						 
						
							
							
								
								Merge pull request  #1606  from hackebrot/show-fixtures-per-test  
							
							... 
							
							
							
							Show fixtures per test 
							
						 
						
							2016-06-14 09:54:18 -03:00  
				
					
						
							
							
								 
						
							
								adc50ac72f 
								
							 
						 
						
							
							
								
								Change format for test function locations  
							
							
							
						 
						
							2016-06-12 15:58:32 +01:00  
				
					
						
							
							
								 
						
							
								b99aace8a9 
								
							 
						 
						
							
							
								
								Fix py26 by using indices in str.format  
							
							
							
						 
						
							2016-06-12 00:52:03 +01:00  
				
					
						
							
							
								 
						
							
								7eea168106 
								
							 
						 
						
							
							
								
								Implement show_fixtures_per_test and add cli flag  
							
							
							
						 
						
							2016-06-12 00:20:06 +01:00  
				
					
						
							
							
								 
						
							
								bdc29968b8 
								
							 
						 
						
							
							
								
								Remove dead code and simplify code in call_fixture_func  
							
							
							
						 
						
							2016-06-08 21:07:56 -03:00  
				
					
						
							
							
								 
						
							
								98acda426f 
								
							 
						 
						
							
							
								
								Remove yieldctx variable being passed around  
							
							
							
						 
						
							2016-06-08 21:07:50 -03: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  
				
					
						
							
							
								 
						
							
								0d80a9c729 
								
							 
						 
						
							
							
								
								Change _showfixtures_main to loop over fixturedefs  
							
							
							
						 
						
							2016-05-31 11:47:16 +01:00