9877bf47e3 
								
							 
						 
						
							
							
								
								Improve commenting for setupplan unittest.  
							
							
							
						 
						
							2016-06-25 12:21:31 +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  
				
					
						
							
							
								 
						
							
								f7d50dfa91 
								
							 
						 
						
							
							
								
								Add a test for handling of dynamic requests for fixtures from other fixtures  
							
							
							
						 
						
							2016-06-22 17:24:55 +02:00  
				
					
						
							
							
								 
						
							
								61992b4e22 
								
							 
						 
						
							
							
								
								Implement --setup-plan option  
							
							
							
						 
						
							2016-06-22 16:45:36 +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  
				
					
						
							
							
								 
						
							
								1a75139f72 
								
							 
						 
						
							
							
								
								Fix the tests  
							
							
							
						 
						
							2016-06-22 13:25:46 +02:00  
				
					
						
							
							
								 
						
							
								7d19f83982 
								
							 
						 
						
							
							
								
								Add test for setuponly option  
							
							
							
						 
						
							2016-06-22 12:00:45 +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  
				
					
						
							
							
								 
						
							
								54872e94b4 
								
							 
						 
						
							
							
								
								Fix test name typo  
							
							
							
						 
						
							2016-06-20 18:44:34 +02:00  
				
					
						
							
							
								 
						
							
								ca093673fb 
								
							 
						 
						
							
							
								
								pytest.raises accept cutom message only when used as context manager  
							
							
							
						 
						
							2016-06-19 21:24:47 +03:00  
				
					
						
							
							
								 
						
							
								e6ff01ada3 
								
							 
						 
						
							
							
								
								CR fixes  
							
							
							
						 
						
							2016-06-16 21:09:15 +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  
				
					
						
							
							
								 
						
							
								b47f155d74 
								
							 
						 
						
							
							
								
								Implement tests for --fixtures-per-test  
							
							
							
						 
						
							2016-06-12 00:17:50 +01: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  
				
					
						
							
							
								 
						
							
								d217b52508 
								
							 
						 
						
							
							
								
								fix   #510  by adding a describing skip marker on empty parameterize  
							
							
							
						 
						
							2016-05-30 14:34:38 +02: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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								b8c15a0215 
								
							 
						 
						
							
							
								
								improved idmaker name selection in case of duplicate ids  
							
							
							
						 
						
							2016-03-23 00:20:58 +02:00  
				
					
						
							
							
								 
						
							
								7885e43b78 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/features' into allow-none-as-parametrized-test-id  
							
							
							
						 
						
							2016-03-20 18:57:17 +02:00  
				
					
						
							
							
								 
						
							
								4b0237c8ee 
								
							 
						 
						
							
							
								
								added test for unique names when recievieng identical ids in parametrize  
							
							
							
						 
						
							2016-03-19 21:42:47 +02:00  
				
					
						
							
							
								 
						
							
								877ca5a0bf 
								
							 
						 
						
							
							
								
								added test for None in paramtrized ids list  
							
							
							
						 
						
							2016-03-19 21:38:24 +02:00  
				
					
						
							
							
								 
						
							
								a8cfd54871 
								
							 
						 
						
							
							
								
								added test for None in idmaker  
							
							
							
						 
						
							2016-03-19 21:23: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  
				
					
						
							
							
								 
						
							
								916c0a8b36 
								
							 
						 
						
							
							
								
								Fix Decimal() and __ne__() errors.  
							
							
							
						 
						
							2016-03-11 16:29:18 -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  
				
					
						
							
							
								 
						
							
								bf97d5b817 
								
							 
						 
						
							
							
								
								Use the plus/minus unicode symbol in the repr string.  
							
							... 
							
							
							
							This was a challenge because it had to work in python2 and python3,
which have almost opposite unicode models, and I couldn't use the six
library.  I'm also not sure the solution I found would work in python3
before python3.3, because I use the u'' string prefix which I think was
initially not part of python3. 
							
						 
						
							2016-03-07 16:40:41 -08:00  
				
					
						
							
							
								 
						
							
								dd28e28b34 
								
							 
						 
						
							
							
								
								Make a few stylistic improvements.  
							
							
							
						 
						
							2016-03-07 10:10:54 -08:00  
				
					
						
							
							
								 
						
							
								6f5e1e386a 
								
							 
						 
						
							
							
								
								Add a convenient and correct way to compare floats.  
							
							
							
						 
						
							2016-03-07 10:10:54 -08:00  
				
					
						
							
							
								 
						
							
								8ce32b0795 
								
							 
						 
						
							
							
								
								When a regex pattern contains bytes instead of a string use escape_encode to turn it into a string before further processing. Thanks @nicoddemus for the review and tips!  
							
							
							
						 
						
							2016-03-05 21:04:34 -05:00  
				
					
						
							
							
								 
						
							
								d8403d793f 
								
							 
						 
						
							
							
								
								Fix decoding issue while formatting SyntaxErrors during collection  
							
							... 
							
							
							
							This happens only in Python 2, as in Python 3 we receive
the "badline" in the exception is already properly encoded
Fix  #578  
							
						 
						
							2016-03-05 16:58:50 -03:00  
				
					
						
							
							
								 
						
							
								5f90907509 
								
							 
						 
						
							
							
								
								Fix skip/xfail markers in parametrized arguments  
							
							... 
							
							
							
							Fix  #1412  
						
							2016-02-25 19:13:09 -03:00  
				
					
						
							
							
								 
						
							
								ee88679c54 
								
							 
						 
						
							
							
								
								Fix bug in strict xfail: test was not being actually called  
							
							
							
						 
						
							2016-02-15 18:43:45 -02:00  
				
					
						
							
							
								 
						
							
								79722ae89b 
								
							 
						 
						
							
							
								
								Add expected exceptions to 'DID NOT RAISE' msg  
							
							
							
						 
						
							2016-02-03 14:12:41 +03:00  
				
					
						
							
							
								 
						
							
								a912d3745b 
								
							 
						 
						
							
							
								
								Moved py.code code over to py.test  
							
							... 
							
							
							
							Fix  #103  
						
							2016-01-25 23:18:04 -02:00