083f64100d 
								
							 
						 
						
							
							
								
								merge master into features  
							
							
							
						 
						
							2016-06-22 14:39:33 +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  
				
					
						
							
							
								 
						
							
								afc5c7e4f6 
								
							 
						 
						
							
							
								
								better message for empty argument skip  
							
							... 
							
							
							
							include the argument names to help determining the fixture/parametrization 
							
						 
						
							2016-05-30 14:42:55 +02:00  
				
					
						
							
							
								 
						
							
								03eb9203fd 
								
							 
						 
						
							
							
								
								remove the old empty argument triggers  
							
							... 
							
							
							
							unlike the marker based one its not composable 
							
						 
						
							2016-05-30 14:41:00 +02:00  
				
					
						
							
							
								 
						
							
								d217b52508 
								
							 
						 
						
							
							
								
								fix   #510  by adding a describing skip marker on empty parameterize  
							
							
							
						 
						
							2016-05-30 14:34:38 +02:00  
				
					
						
							
							
								 
						
							
								eab762ea99 
								
							 
						 
						
							
							
								
								Merge branch 'master' into merge-master  
							
							
							
						 
						
							2016-05-13 19:37:41 +02:00  
				
					
						
							
							
								 
						
							
								75abfbe8d4 
								
							 
						 
						
							
							
								
								Fix typo in doc  
							
							
							
						 
						
							2016-04-28 14:40:17 +10:00  
				
					
						
							
							
								 
						
							
								6cc56b4a1b 
								
							 
						 
						
							
							
								
								Merge pull request  #1535  from palaviv/parametrize-test-ids-hook  
							
							... 
							
							
							
							introduce pytest_make_parametrize_id hook 
							
						 
						
							2016-04-27 16:16:16 +02:00  
				
					
						
							
							
								 
						
							
								9733127951 
								
							 
						 
						
							
							
								
								pytest_make_parametrize_id receive config object  
							
							
							
						 
						
							2016-04-26 10:23:57 +03:00  
				
					
						
							
							
								 
						
							
								b9faf78d51 
								
							 
						 
						
							
							
								
								Added test_pytest_make_parametrize_id  
							
							
							
						 
						
							2016-04-25 17:48:28 +03:00  
				
					
						
							
							
								 
						
							
								79927428d1 
								
							 
						 
						
							
							
								
								Added pytest_make_parametrize_id hook  
							
							
							
						 
						
							2016-04-25 17:11:47 +03:00  
				
					
						
							
							
								 
						
							
								56855893ca 
								
							 
						 
						
							
							
								
								Raise CollectError if import test module fails  
							
							... 
							
							
							
							One of the reasons for failing to import the test module is invalid Python
identifiers in the full package path of the test module.
fix  #1426  
							
						 
						
							2016-04-23 13:50:48 +02:00  
				
					
						
							
							
								 
						
							
								23a8e2b469 
								
							 
						 
						
							
							
								
								Add .hypothesis to .gitignore and try an older version of Hypothesis for 2.6  
							
							
							
						 
						
							2016-04-02 11:47:37 -04:00  
				
					
						
							
							
								 
						
							
								491b30c5d9 
								
							 
						 
						
							
							
								
								Add Hypothesis test for _idval and fix bug it found  
							
							
							
						 
						
							2016-04-01 22:45:44 -04:00  
				
					
						
							
							
								 
						
							
								9b438d56e8 
								
							 
						 
						
							
							
								
								Fix a test_unicode_idval_python2 (now test_unicode_idval) and associated string handling on Python 3  
							
							
							
						 
						
							2016-04-01 12:27:17 -04:00  
				
					
						
							
							
								 
						
							
								c66aedfa65 
								
							 
						 
						
							
							
								
								checking first there are duplciates ids before changing to unique names  
							
							
							
						 
						
							2016-03-23 18:47:27 +02:00  
				
					
						
							
							
								 
						
							
								b8c15a0215 
								
							 
						 
						
							
							
								
								improved idmaker name selection in case of duplicate ids  
							
							
							
						 
						
							2016-03-23 00:20:58 +02:00  
				
					
						
							
							
								 
						
							
								1f46015de5 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/features' into features  
							
							
							
						 
						
							2016-03-22 16:22:00 -04:00  
				
					
						
							
							
								 
						
							
								4405dd0ffe 
								
							 
						 
						
							
							
								
								Escape both bytes and unicode strings for "ids" in Metafunc.parametrize  
							
							
							
						 
						
							2016-03-22 01:31:48 -04:00  
				
					
						
							
							
								 
						
							
								7885e43b78 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/features' into allow-none-as-parametrized-test-id  
							
							
							
						 
						
							2016-03-20 18:57:17 +02:00  
				
					
						
							
							
								 
						
							
								32f44ce2fd 
								
							 
						 
						
							
							
								
								updated parametrize documentation  
							
							
							
						 
						
							2016-03-20 18:54:48 +02:00  
				
					
						
							
							
								 
						
							
								be1954afbc 
								
							 
						 
						
							
							
								
								allow None to be passed in ids list for specific test and recieve idmaker name for test  
							
							
							
						 
						
							2016-03-19 21:22:49 +02:00  
				
					
						
							
							
								 
						
							
								5fcce8a7d6 
								
							 
						 
						
							
							
								
								Merge branch 'master' into merge-master-into-features  
							
							
							
						 
						
							2016-03-18 18:26:56 -03:00  
				
					
						
							
							
								 
						
							
								5ceee08590 
								
							 
						 
						
							
							
								
								Fix CHANGELOG merge conflicts.  
							
							
							
						 
						
							2016-03-14 11:55:50 -07:00  
				
					
						
							
							
								 
						
							
								0dcc862a56 
								
							 
						 
						
							
							
								
								Fix some typos in the documentation.  
							
							
							
						 
						
							2016-03-14 11:38:00 -07:00  
				
					
						
							
							
								 
						
							
								9e7206a1cf 
								
							 
						 
						
							
							
								
								Fix a few stylistic issues.  
							
							
							
						 
						
							2016-03-14 11:29:45 -07:00  
				
					
						
							
							
								 
						
							
								916c0a8b36 
								
							 
						 
						
							
							
								
								Fix Decimal() and __ne__() errors.  
							
							
							
						 
						
							2016-03-11 16:29:18 -08:00  
				
					
						
							
							
								 
						
							
								078448008c 
								
							 
						 
						
							
							
								
								Discuss alternative float comparison algorithms.  
							
							
							
						 
						
							2016-03-11 15:59:48 -08:00  
				
					
						
							
							
								 
						
							
								42a7e0488d 
								
							 
						 
						
							
							
								
								Properly handle inf, nan, and built-in numeric types.  
							
							... 
							
							
							
							This commit also:
- Dramatically increases the number of unit tests , mostly by borrowing
  from the standard  library's unit tests for math.isclose().
- Refactors approx() into two classes, one of which handles comparing
  individual numbers (ApproxNonIterable) and another which uses the
  first to compare individual numbers or sequences of numbers. 
							
						 
						
							2016-03-11 08:49:26 -08: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  
				
					
						
							
							
								 
						
							
								7d155bd3cf 
								
							 
						 
						
							
							
								
								Fix sys.version_info errors.  
							
							
							
						 
						
							2016-03-08 10:12:31 -08:00  
				
					
						
							
							
								 
						
							
								6a902924f8 
								
							 
						 
						
							
							
								
								Fix trailing whitespace errors.  
							
							
							
						 
						
							2016-03-07 19:56:23 -08:00  
				
					
						
							
							
								 
						
							
								c9c73b8d8e 
								
							 
						 
						
							
							
								
								Fix zero-length field name error in python2.6  
							
							
							
						 
						
							2016-03-07 19:54:43 -08:00