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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								5dab0954a0 
								
							 
						 
						
							
							
								
								Add approx() to the Sphinx docs.  
							
							
							
						 
						
							2016-03-07 18:14:49 -08:00  
				
					
						
							
							
								 
						
							
								b8a8382c2c 
								
							 
						 
						
							
							
								
								Reduce the default absolute error threshold to 1e-12.  
							
							
							
						 
						
							2016-03-07 16:43:53 -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  
				
					
						
							
							
								 
						
							
								6d4b14d7ee 
								
							 
						 
						
							
							
								
								Merge pull request  #1438  from Bachmann1234/issue-1437  
							
							... 
							
							
							
							Make a good faith effort to display a bytestring when one is provided… 
							
						 
						
							2016-03-06 06:48:32 +01: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  
				
					
						
							
							
								 
						
							
								24d3e01548 
								
							 
						 
						
							
							
								
								pytest.fail with non-ascii characters raises an internal pytest error  
							
							... 
							
							
							
							Fix  #1178  
						
							2016-03-05 16:09:01 -03:00  
				
					
						
							
							
								 
						
							
								cf9a09e988 
								
							 
						 
						
							
							
								
								catch IndexError exceptions when getting exception source location  
							
							
							
						 
						
							2016-02-26 08:18:12 -04: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  
				
					
						
							
							
								 
						
							
								7b13c4bec0 
								
							 
						 
						
							
							
								
								Fix flakes  
							
							
							
						 
						
							2016-01-14 21:01:57 -02:00  
				
					
						
							
							
								 
						
							
								ec02f694ef 
								
							 
						 
						
							
							
								
								Update python.py  
							
							... 
							
							
							
							updated dictionary itteration to create a list for generation, so that tests can be added in the generator functions under python3. This works fine as-is in python2 because python 2 already creates a list, whereas python3 returns an itterator. Forcing a list format for the return fixes python3 to work the same way as python2 
							
						 
						
							2015-12-09 11:32:19 -08:00  
				
					
						
							
							
								 
						
							
								b5d65e5139 
								
							 
						 
						
							
							
								
								Merge pull request  #1206  from The-Compiler/collect-getattr  
							
							... 
							
							
							
							Don't collect classes with truthy __getattr__. 
							
						 
						
							2015-11-30 17:23:47 +01:00  
				
					
						
							
							
								 
						
							
								ba9146c131 
								
							 
						 
						
							
							
								
								Don't collect classes with truthy __getattr__.  
							
							... 
							
							
							
							When we have a metaclass which returns something truthy (like a method) in its
__getattr__, we collected the class because pytest thought its __test__
attribute was set to True.
We can work around this to some degree by assuming __test__ will always be set
to an explicit True if that's what the user has intended, and if it's something
other than that, this is probably a mistake.
Fixes  #1204 . 
							
						 
						
							2015-11-30 16:41:13 +01:00  
				
					
						
							
							
								 
						
							
								c790f7475e 
								
							 
						 
						
							
							
								
								Fix getting line number with nasty __getattr__.  
							
							... 
							
							
							
							When an object has a custom __getattr__ which always returns a non-int, we
tried to get compat_co_firstlineno from it and checked it was a integer, which
caused an exception if such a class is mistakenly collected.
If we still mistakenly collect such a class (which is likely to be something
other than a test), we now skip it with a warning (because it probably has an
__init__) instead of producing an error.
See #1204 . 
							
						 
						
							2015-11-30 16:13:15 +01:00  
				
					
						
							
							
								 
						
							
								311b0a9683 
								
							 
						 
						
							
							
								
								Fix situation where a traceback entry "path" returns a str object  
							
							... 
							
							
							
							Fix  #1133  
						
							2015-10-16 20:18:14 -03:00  
				
					
						
							
							
								 
						
							
								a3bda59a30 
								
							 
						 
						
							
							
								
								collection: Prevent non-function callables from being collected  
							
							... 
							
							
							
							Fixes issue 331
previously to this change the collection code would issue a warning for
when ever it encountered a variable that looked like a test but wasn't a
function saying that it wouldn't collect it because it wasn't a function.
This fixes the logic so that if that warning is issued it really isn't
collected.
However previously special cases existed to support tests that were
created using functools.wraps and functools.partial. So the condition for
issuing that warning has been updated to take that in to account
Also try the old way of detecting functions just for proper integration
with mock.path in python 2.7 the get_real_func returned the unbound method 
							
						 
						
							2015-10-12 22:23:18 +01:00  
				
					
						
							
							
								 
						
							
								88c8dd96f9 
								
							 
						 
						
							
							
								
								issue1035 Override inspect.isclass for python 2.6  
							
							
							
						 
						
							2015-10-09 19:44:47 +01:00  
				
					
						
							
							
								 
						
							
								493530ec6d 
								
							 
						 
						
							
							
								
								typo fix, changed position of context manager notes  
							
							
							
						 
						
							2015-10-05 12:13:25 -07:00  
				
					
						
							
							
								 
						
							
								5171d167ce 
								
							 
						 
						
							
							
								
								Move "note" to the end of the main text  
							
							... 
							
							
							
							Fix  #1097  
						
							2015-10-02 18:14:17 -03:00  
				
					
						
							
							
								 
						
							
								2981bece55 
								
							 
						 
						
							
							
								
								pyflakes fix  
							
							
							
						 
						
							2015-10-02 13:03:43 -07:00  
				
					
						
							
							
								 
						
							
								fd211bf490 
								
							 
						 
						
							
							
								
								Add a note about usage of the context manager  
							
							... 
							
							
							
							Addesses #1097  
							
						 
						
							2015-10-02 12:40:58 -07:00  
				
					
						
							
							
								 
						
							
								f3cee8f0b5 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into param-ids-fix  
							
							
							
						 
						
							2015-10-01 07:58:55 -03:00  
				
					
						
							
							
								 
						
							
								d1e00f6e19 
								
							 
						 
						
							
							
								
								Detect dynamic code explicitly in filter_traceback  
							
							
							
						 
						
							2015-09-30 17:32:49 -03:00  
				
					
						
							
							
								 
						
							
								c9480c5b8b 
								
							 
						 
						
							
							
								
								Move imports outside _escape_bytes as suggested in review  
							
							
							
						 
						
							2015-09-30 17:02:19 -03:00  
				
					
						
							
							
								 
						
							
								11f100813e 
								
							 
						 
						
							
							
								
								Fix internal error when filtering tracebacks where one entry was generated by an exec() statement  
							
							... 
							
							
							
							Fix  #995  
						
							2015-09-29 22:29:43 -03:00  
				
					
						
							
							
								 
						
							
								b64470443f 
								
							 
						 
						
							
							
								
								Fix SystemError when using unicode_escape on Python 3  
							
							... 
							
							
							
							Fix  #1087  
						
							2015-09-29 18:20:30 -03:00  
				
					
						
							
							
								 
						
							
								8633c4cefd 
								
							 
						 
						
							
							
								
								Fix encoding errors for parametrized tests with unicode parameters in py2  
							
							... 
							
							
							
							Fix  #1085  
						
							2015-09-29 17:57:49 -03:00  
				
					
						
							
							
								 
						
							
								1c0ffc5caf 
								
							 
						 
						
							
							
								
								seems like pypy's callable builtin calls __getattr__ so we do the check  
							
							... 
							
							
							
							later. 
							
						 
						
							2015-09-28 14:02:30 +02:00  
				
					
						
							
							
								 
						
							
								e1063678f1 
								
							 
						 
						
							
							
								
								escape bytes when creating ids for parametrized values  
							
							
							
						 
						
							2015-09-22 23:18:09 -03:00  
				
					
						
							
							
								 
						
							
								ca460e11e6 
								
							 
						 
						
							
							
								
								Merge pull request  #1051  from Akasurde/issue_1027  
							
							... 
							
							
							
							Added minor documentation change in python.py 
							
						 
						
							2015-09-22 17:09:25 +02:00  
				
					
						
							
							
								 
						
							
								dc1ce51ac2 
								
							 
						 
						
							
							
								
								Added minor documentation change  
							
							... 
							
							
							
							Signed-off-by: Abhijeet Kasurde <akasurde@redhat.com> 
							
						 
						
							2015-09-22 20:15:49 +05:30  
				
					
						
							
							
								 
						
							
								3bcda48ba4 
								
							 
						 
						
							
							
								
								Merge pull request  #1009  from mdboom/deprecation-warnings  
							
							... 
							
							
							
							avoid deprecation warnings, introduce helpers. 
							
						 
						
							2015-09-17 13:37:26 +02:00  
				
					
						
							
							
								 
						
							
								a62d12634c 
								
							 
						 
						
							
							
								
								revert importing test module behaviour to prepend by default  
							
							
							
						 
						
							2015-09-16 22:12:20 +02:00  
				
					
						
							
							
								 
						
							
								bf74401fd3 
								
							 
						 
						
							
							
								
								Use __code__.co_argcount  
							
							
							
						 
						
							2015-09-16 11:05:54 -04:00  
				
					
						
							
							
								 
						
							
								08a572086b 
								
							 
						 
						
							
							
								
								Fix lookup of special values  
							
							
							
						 
						
							2015-09-16 11:02:36 -04:00  
				
					
						
							
							
								 
						
							
								9c19728d2b 
								
							 
						 
						
							
							
								
								Fix checking for args  
							
							
							
						 
						
							2015-09-16 06:45:51 -04:00  
				
					
						
							
							
								 
						
							
								859259ddae 
								
							 
						 
						
							
							
								
								Simplify  
							
							
							
						 
						
							2015-09-16 06:43:16 -04:00  
				
					
						
							
							
								 
						
							
								a0cefb3213 
								
							 
						 
						
							
							
								
								Use inspect.signature instead of inspect.getargspec  
							
							
							
						 
						
							2015-09-16 06:33:53 -04:00  
				
					
						
							
							
								 
						
							
								0b3f1b4a7c 
								
							 
						 
						
							
							
								
								Create `_pytest.vendored_packages` and _pytest._pluggy  
							
							... 
							
							
							
							- Replace imports from "pluggy" to "_pytest._pluggy"
- Fallback to import "pluggy" from global namespace if
  not found in _pytest.vendored_packges 
							
						 
						
							2015-09-07 13:01:54 -03:00  
				
					
						
							
							
								 
						
							
								885e461ae3 
								
							 
						 
						
							
							
								
								Fix overriding of fixtures with parametrization.  
							
							... 
							
							
							
							Fixes  #979 , see #926 . 
						
							2015-08-31 14:38:39 +02:00  
				
					
						
							
							
								 
						
							
								e67d66a5d4 
								
							 
						 
						
							
							
								
								Merge branch 'pytest-dev'  
							
							... 
							
							
							
							# Conflicts:
#	AUTHORS 
							
						 
						
							2015-08-24 22:55:11 +03:00  
				
					
						
							
							
								 
						
							
								06585f5bdd 
								
							 
						 
						
							
							
								
								Always report error about parametrize data that doesn't correspond to fixtures in test functions.  
							
							
							
						 
						
							2015-08-23 13:42:40 +03: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  
				
					
						
							
							
								 
						
							
								353360dbe5 
								
							 
						 
						
							
							
								
								use local isclass  
							
							
							
						 
						
							2015-08-09 00:11:15 +01:00  
				
					
						
							
							
								 
						
							
								3497aa0766 
								
							 
						 
						
							
							
								
								check nose.istest __test__ attr issue526  
							
							
							
						 
						
							2015-08-09 00:11:15 +01:00  
				
					
						
							
							
								 
						
							
								729b5e9b2f 
								
							 
						 
						
							
							
								
								Merge pull request  #923  from The-Compiler/parametrize-idfunc  
							
							... 
							
							
							
							Generate parametrize IDs for enum/re/class objects. 
							
						 
						
							2015-08-08 15:09:54 -03:00  
				
					
						
							
							
								 
						
							
								4e21d1d77b 
								
							 
						 
						
							
							
								
								Move enum import and adjust comments.  
							
							
							
						 
						
							2015-08-08 15:25:10 +02:00  
				
					
						
							
							
								 
						
							
								84fdba129a 
								
							 
						 
						
							
							
								
								More style changes.  
							
							
							
						 
						
							2015-08-08 12:57:54 +02:00  
				
					
						
							
							
								 
						
							
								18125c7d1f 
								
							 
						 
						
							
							
								
								Clean up type comparisons.  
							
							
							
						 
						
							2015-08-07 23:10:22 +02:00  
				
					
						
							
							
								 
						
							
								b59376bea4 
								
							 
						 
						
							
							
								
								Alert user about other parametrize spellings.  
							
							
							
						 
						
							2015-08-07 07:51:59 +02:00  
				
					
						
							
							
								 
						
							
								13c5456868 
								
							 
						 
						
							
							
								
								Generate parametrize IDs for enum/re/class objects.  
							
							
							
						 
						
							2015-08-07 07:37:59 +02:00  
				
					
						
							
							
								 
						
							
								f7bacd169e 
								
							 
						 
						
							
							
								
								Update docs  
							
							
							
						 
						
							2015-08-04 00:48:41 +03:00  
				
					
						
							
							
								 
						
							
								657ca97dbd 
								
							 
						 
						
							
							
								
								Some refactorings after code review  
							
							
							
						 
						
							2015-08-04 00:02:03 +03:00  
				
					
						
							
							
								 
						
							
								9846953597 
								
							 
						 
						
							
							
								
								Support for python 2.6  
							
							
							
						 
						
							2015-08-02 17:28:27 +03:00  
				
					
						
							
							
								 
						
							
								2fc7aede0b 
								
							 
						 
						
							
							
								
								Request  #714 : Apply indirect=True on particular argnames  
							
							
							
						 
						
							2015-08-02 16:40:40 +03:00  
				
					
						
							
							
								 
						
							
								52b4eb6c46 
								
							 
						 
						
							
							
								
								Added `warns` to assert warnings are thrown  
							
							... 
							
							
							
							Works in a similar manner to `raises`, but for warnings instead
of exceptions. Also refactored `recwarn.py` so that all the
warning recording and checking use the same core code. 
							
						 
						
							2015-07-30 23:28:32 -04:00  
				
					
						
							
							
								 
						
							
								e8f4819876 
								
							 
						 
						
							
							
								
								Test file run twice fails if it contains marked class  #683  
							
							
							
						 
						
							2015-07-26 12:15:29 +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  
				
					
						
							
							
								 
						
							
								ce96973ed5 
								
							 
						 
						
							
							
								
								Merge pull request  #864  from pytest-dev/consider-color-yes-everywhere  
							
							... 
							
							
							
							Consider --color option in more places which deal with TerminalWriters 
							
						 
						
							2015-07-23 08:03:52 -03:00  
				
					
						
							
							
								 
						
							
								31cfbac1f4 
								
							 
						 
						
							
							
								
								Fix autouse fixtures defined in a TestCase subclass  
							
							
							
						 
						
							2015-07-20 19:28:54 -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  
				
					
						
							
							
								 
						
							
								a7b4ed89da 
								
							 
						 
						
							
							
								
								Use functools.partial name explicitly and simplify the code a bit as asked in review  
							
							
							
						 
						
							2015-07-16 20:37:04 -03:00  
				
					
						
							
							
								 
						
							
								dcdc823dd2 
								
							 
						 
						
							
							
								
								Support for tests created with functools.partial  
							
							... 
							
							
							
							Fix  #811  
						
							2015-07-16 20:37:03 -03:00  
				
					
						
							
							
								 
						
							
								5ec2a17f08 
								
							 
						 
						
							
							
								
								--fixtures only shows fixtures from first file  
							
							... 
							
							
							
							Fix  #833  
						
							2015-07-12 17:32:39 -03:00  
				
					
						
							
							
								 
						
							
								0ee3ee7333 
								
							 
						 
						
							
							
								
								Add syntax highlighting to missing snippets in the documentation and other fixes  
							
							... 
							
							
							
							- Add explicit "code-block" for sessions without syntax highlight
- Moved Metafunc documentation to the class docstring and reused that in the
   docs; 
							
						 
						
							2015-07-09 21:50:38 -03:00  
				
					
						
							
							
								 
						
							
								ee40ea5f6d 
								
							 
						 
						
							
							
								
								Merge branch 'pytest-2.7'  
							
							... 
							
							
							
							Conflicts:
	AUTHORS
	_pytest/__init__.py
	setup.py
	testing/conftest.py
	tox.ini 
							
						 
						
							2015-06-23 16:49:05 +02:00  
				
					
						
							
							
								 
						
							
								eb73db56c7 
								
							 
						 
						
							
							
								
								Fix issue where pytest.raises() doesn't always return Exception instance in py26  
							
							... 
							
							
							
							Fixes  #767  
						
							2015-06-19 07:46:47 -03:00  
				
					
						
							
							
								 
						
							
								b40f760cc3 
								
							 
						 
						
							
							
								
								Change links from bitbucket to GitHub  
							
							
							
						 
						
							2015-06-15 18:28:31 -03:00  
				
					
						
							
							
								 
						
							
								bddc88f09e 
								
							 
						 
						
							
							
								
								adapt to pluggy naming, rename pytest.hookspec_opts to pytest.hookspec,s ame with hookimpl_opts  
							
							... 
							
							
							
							--HG--
branch : pluggy1 
							
						 
						
							2015-05-06 10:08:08 +02:00  
				
					
						
							
							
								 
						
							
								5ee7ee0850 
								
							 
						 
						
							
							
								
								adapt pytest to using pluggy (current master)  
							
							... 
							
							
							
							--HG--
branch : pluggy1 
							
						 
						
							2015-04-29 16:40:51 +02:00  
				
					
						
							
							
								 
						
							
								4e116ed503 
								
							 
						 
						
							
							
								
								make pytest_plugin_registered a historic hook  
							
							... 
							
							
							
							--HG--
branch : more_plugin 
							
						 
						
							2015-04-25 13:38:30 +02:00  
				
					
						
							
							
								 
						
							
								2f8a1aed6e 
								
							 
						 
						
							
							
								
								properly perform hook calls with extra methods  
							
							... 
							
							
							
							--HG--
branch : more_plugin 
							
						 
						
							2015-04-25 11:29:11 +02:00  
				
					
						
							
							
								 
						
							
								d2a5c7f99b 
								
							 
						 
						
							
							
								
								add documented hookimpl_opts and hookspec_opts decorators  
							
							... 
							
							
							
							so that one doesn't have to use pytest.mark or function-attribute setting anymore
--HG--
branch : more_plugin 
							
						 
						
							2015-04-25 11:29:11 +02:00  
				
					
						
							
							
								 
						
							
								31af381c56 
								
							 
						 
						
							
							
								
								Merged in hpk42/pytest-patches/prefer_installed (pull request  #275 )  
							
							... 
							
							
							
							change test module importing behaviour to append to sys.path 
							
						 
						
							2015-04-21 10:47:33 +01:00  
				
					
						
							
							
								 
						
							
								0b361c62c8 
								
							 
						 
						
							
							
								
								Merged in getsourcelines-error-issue-553-pytest2.7 (pull request  #273 )  
							
							... 
							
							
							
							Handle inspect.getsourcelines failures in FixtureLookupError
--HG--
branch : pytest-2.7 
							
						 
						
							2015-04-17 22:31:55 +02:00  
				
					
						
							
							
								 
						
							
								5c8e5acf9d 
								
							 
						 
						
							
							
								
								change test module importing behaviour to append to sys.path  
							
							... 
							
							
							
							instead of prepending.  This better allows to run test modules
against installated versions of a package even if the package
under test has the same import root.  In this example::
   testing/__init__.py
   testing/test_pkg_under_test.py
   pkg_under_test/
the tests will preferrably run against the installed version
of pkg_under_test whereas before they would always pick
up the local version.
--HG--
branch : prefer_installed 
							
						 
						
							2015-04-17 22:25:35 +02:00  
				
					
						
							
							
								 
						
							
								173bd13ece 
								
							 
						 
						
							
							
								
								backport Y->y fix from floris  
							
							... 
							
							
							
							--HG--
branch : pytest-2.7 
							
						 
						
							2015-04-17 11:57:09 +02:00  
				
					
						
							
							
								 
						
							
								15328c04eb 
								
							 
						 
						
							
							
								
								Handle inspect.getsourcelines failures in FixtureLookupError  
							
							... 
							
							
							
							Fixes  #553 
--HG--
branch : getsourcelines-error-issue-553-pytest2.7 
						
							2015-04-15 19:31:22 -03:00  
				
					
						
							
							
								 
						
							
								c7a60af666 
								
							 
						 
						
							
							
								
								Use capital Y as the tests look for that  
							
							
							
						 
						
							2015-04-13 09:08:10 +01: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  
				
					
						
							
							
								 
						
							
								ce95437dee 
								
							 
						 
						
							
							
								
								merge with default  
							
							... 
							
							
							
							--HG--
branch : issue463 
							
						 
						
							2015-03-23 20:41:27 +01:00  
				
					
						
							
							
								 
						
							
								43e4fcf6dd 
								
							 
						 
						
							
							
								
								Raise specific MarkerError rather than generic ValueError  
							
							... 
							
							
							
							--HG--
branch : issue463 
							
						 
						
							2015-03-23 20:01:58 +01:00  
				
					
						
							
							
								 
						
							
								65ca554230 
								
							 
						 
						
							
							
								
								duplicate assignment  
							
							
							
						 
						
							2015-03-23 20:47:34 +05:30  
				
					
						
							
							
								 
						
							
								deb163d237 
								
							 
						 
						
							
							
								
								Change string format syntax from {} to {0} for py2.6  
							
							... 
							
							
							
							--HG--
branch : issue463 
							
						 
						
							2015-03-21 23:57:06 +01:00  
				
					
						
							
							
								 
						
							
								6f81602ba2 
								
							 
						 
						
							
							
								
								Use hasattr instead of try/except  
							
							... 
							
							
							
							--HG--
branch : issue463 
							
						 
						
							2015-03-21 23:30:13 +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  
				
					
						
							
							
								 
						
							
								33c2a3a3e5 
								
							 
						 
						
							
							
								
								make loop more readable  
							
							... 
							
							
							
							--HG--
branch : parametrized-fixture-override 
							
						 
						
							2015-03-02 08:55:57 +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  
				
					
						
							
							
								 
						
							
								1e6e373913 
								
							 
						 
						
							
							
								
								Merged in issue616 (pull request  #252 )  
							
							... 
							
							
							
							fix issue616 - conftest visibility fixes. 
							
						 
						
							2015-02-28 10:02:58 +01:00  
				
					
						
							
							
								 
						
							
								c3ca44b46f 
								
							 
						 
						
							
							
								
								change links to go to the new pytest-dev bitbucket team's repo location  
							
							... 
							
							
							
							--HG--
branch : docs_community 
							
						 
						
							2015-02-27 12:27:40 +01:00  
				
					
						
							
							
								 
						
							
								d73e689991 
								
							 
						 
						
							
							
								
								fix issue616 - conftest visibility fixes.  This is achieved by  
							
							... 
							
							
							
							refactoring how nodeid's are constructed.  They now are always
relative to the "common rootdir" of a test run which is determined by
finding a common ancestor of all testrun arguments.
--HG--
branch : issue616 
							
						 
						
							2015-02-26 21:56:44 +01:00  
				
					
						
							
							
								 
						
							
								5941b2e071 
								
							 
						 
						
							
							
								
								fix issue 655: crude workarounds around python2/3 exception leaks  
							
							
							
						 
						
							2015-01-09 19:55:49 +01:00  
				
					
						
							
							
								 
						
							
								959395b796 
								
							 
						 
						
							
							
								
								fix py26 compatibility  
							
							
							
						 
						
							2014-10-27 10:02:15 +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  
				
					
						
							
							
								 
						
							
								0b620c304b 
								
							 
						 
						
							
							
								
								checking that option contains glob characters before calling fnmatch  
							
							... 
							
							
							
							requested during code review
--HG--
branch : python-classes-glob 
							
						 
						
							2014-10-20 18:36:31 -02:00  
				
					
						
							
							
								 
						
							
								b928928942 
								
							 
						 
						
							
							
								
								added support for glob-style patterns to python_classes and python_functions config options  
							
							... 
							
							
							
							fixes  #600 
--HG--
branch : python-classes-glob 
						
							2014-10-16 19:27:10 -03: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  
				
					
						
							
							
								 
						
							
								6ab36592ea 
								
							 
						 
						
							
							
								
								docs for "pytest_addhooks" hook.  Thanks Bruno Oliveira.  
							
							... 
							
							
							
							updated plugin index docs.  Thanks Bruno Oliveira.
fix issue557: with "-k" we only allow the old style "-" for negation
at the beginning of strings and even that is deprecated.  Use "not" instead.
This should allow to pick parametrized tests where "-" appeared in the parameter. 
							
						 
						
							2014-10-06 14:26:03 +02:00  
				
					
						
							
							
								 
						
							
								1d10db4bab 
								
							 
						 
						
							
							
								
								cleanup core collection of python methods and remove unncessary cache  
							
							
							
						 
						
							2014-10-06 14:06:17 +02:00  
				
					
						
							
							
								 
						
							
								2f141bbc54 
								
							 
						 
						
							
							
								
								change the defaults from a tuple to a list so I can use config.addinivalue_line("python_files", "...") to append new options in my own plugins  
							
							... 
							
							
							
							--HG--
branch : dgilcrease/change-defaults-from-a-tuple-to-a-list-1412285169250 
							
						 
						
							2014-10-02 21:32:35 +00:00  
				
					
						
							
							
								 
						
							
								3de715ec13 
								
							 
						 
						
							
							
								
								refine internal management of plugins and conftest files  
							
							
							
						 
						
							2014-10-01 12:19:11 +02: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  
				
					
						
							
							
								 
						
							
								ba878c6d9d 
								
							 
						 
						
							
							
								
								add changelog entry and refactor unittest.mock.patch fix a bit  
							
							
							
						 
						
							2014-07-28 10:34:01 +02:00  
				
					
						
							
							
								 
						
							
								2e55c4ba61 
								
							 
						 
						
							
							
								
								unittest.mock from stdlib should come last  
							
							... 
							
							
							
							--HG--
branch : mock-unittest-252 
							
						 
						
							2014-07-27 12:11:39 +02:00  
				
					
						
							
							
								 
						
							
								e6ad6e02d2 
								
							 
						 
						
							
							
								
								Handle also unittest.mock  
							
							... 
							
							
							
							Move handling in dedicated function to isolate its logic
--HG--
branch : mock-unittest-252 
							
						 
						
							2014-07-27 10:43:50 +02:00  
				
					
						
							
							
								 
						
							
								1641d00cb1 
								
							 
						 
						
							
							
								
								Merge default  
							
							
							
						 
						
							2014-07-18 01:34:08 +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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								98ea8fae32 
								
							 
						 
						
							
							
								
								break reference cycles caused by storing local reference to exception info  
							
							... 
							
							
							
							Such reference cycles unnecessarily cause Python interpreter not to garbage
collect the objects referenced in those cycles as soon they could be collected,
and in turn cause the tests to use more memory than is strictly necessary.
--HG--
branch : break_ExceptionInfo_reference_cycles 
							
						 
						
							2014-04-02 15:34:36 +02:00  
				
					
						
							
							
								 
						
							
								3b8935c533 
								
							 
						 
						
							
							
								
								remove dupped_stdout logic and related changes, also simplify pytest_runtest_* calls to not use a contextlib with-decorator anymore.  
							
							
							
						 
						
							2014-04-01 15:03:17 +02:00  
				
					
						
							
							
								 
						
							
								7b63fa5966 
								
							 
						 
						
							
							
								
								merge in current default  
							
							
							
						 
						
							2014-03-27 13:57:54 +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  
				
					
						
							
							
								 
						
							
								e3b9382122 
								
							 
						 
						
							
							
								
								use sys.modules.get correctly and reference DEFAULT with respect to it  
							
							
							
						 
						
							2014-03-26 09:36:02 -07:00  
				
					
						
							
							
								 
						
							
								c3f4eb6d57 
								
							 
						 
						
							
							
								
								change try/except to sys.module.get and a conditional  
							
							
							
						 
						
							2014-03-26 09:27:33 -07:00  
				
					
						
							
							
								 
						
							
								9777703e03 
								
							 
						 
						
							
							
								
								- turn on capturing before early conftest loading and make terminal writer  
							
							... 
							
							
							
							use the original stream.
- avoid resetting capture FDs/sys.stdout for each test by keeping capturing
  always turned on and looking at snapshotted capturing data during runtest
  and collection phases. 
							
						 
						
							2014-03-14 12:49: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  
				
					
						
							
							
								 
						
							
								75c124ea17 
								
							 
						 
						
							
							
								
								reword note on explicitly clearing local references to pytest.raises() results  
							
							... 
							
							
							
							Made it clearer that clearing such references is not mandatory and is only an
optional step which may help the Python interpreter speed up its garbage
collection.
--HG--
branch : document_ExceptionInfo_ref_cycle 
							
						 
						
							2014-01-23 11:36:04 +01:00  
				
					
						
							
							
								 
						
							
								ffffac27f9 
								
							 
						 
						
							
							
								
								document explicitly clearing local references to pytest.raises() results  
							
							... 
							
							
							
							pytest.raises() returns an ExceptionInfo object which, if a local reference is
made to it, forms a reference cycle:
  ExceptionInfo
  --> exception
  --> stack frame raising the exception
  --> current stack frame
  --> current local variables
  --> Exception Info
Such a reference cycle would then prevent any local variables in the current
stack frame, or any of its child stack frames involved in the same reference
cycle, from being garbage collected until the next reference cycle garbage
collection phase. This unnecessarily increases the program's memory footprint
and potentially slows it down.
This situation is based on a similar one described in the official 'try'
statement Python documentation for locally stored exception references.
--HG--
branch : document_ExceptionInfo_ref_cycle 
							
						 
						
							2014-01-23 09:46:36 +01:00  
				
					
						
							
							
								 
						
							
								657a395839 
								
							 
						 
						
							
							
								
								fix comment typos  
							
							
							
						 
						
							2014-01-18 12:39:16 +01:00  
				
					
						
							
							
								 
						
							
								9fb2079458 
								
							 
						 
						
							
							
								
								replace py.test module references with pytest  
							
							... 
							
							
							
							The only remaining 'py.test' references are:
 * those referring to the 'py.test' executable
 * those in code explicitly testing py.test/pytest module compatibility
 * those in old CHANGES documentation
 * those in documentation generated based on external data
 * those in seemingly unfinished & unmaintained Japanese documentation
Minor stylistic changes and typo corrections made to documentation next to
several applied py.test --> pytest content changes. 
							
						 
						
							2014-01-18 12:31:33 +01:00  
				
					
						
							
							
								 
						
							
								b820cf2e39 
								
							 
						 
						
							
							
								
								Fix docstring  
							
							... 
							
							
							
							This was copied from another paramterize call and I forgot to change
the parameters referred too. 
							
						 
						
							2013-12-16 10:51:50 +00:00  
				
					
						
							
							
								 
						
							
								b4797d6295 
								
							 
						 
						
							
							
								
								fix issue403 : allow same-name parametrized functions within a collector  
							
							
							
						 
						
							2013-12-16 07:47:59 +01:00  
				
					
						
							
							
								 
						
							
								c9195a0f45 
								
							 
						 
						
							
							
								
								fix py32 failures and remove random print from commit accident  
							
							
							
						 
						
							2013-12-16 07:19:49 +01:00  
				
					
						
							
							
								 
						
							
								ef023ebad3 
								
							 
						 
						
							
							
								
								merge  
							
							
							
						 
						
							2013-12-16 07:01:58 +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  
				
					
						
							
							
								 
						
							
								901f764825 
								
							 
						 
						
							
							
								
								merge  
							
							
							
						 
						
							2013-12-14 14:00:47 +01:00  
				
					
						
							
							
								 
						
							
								7b87f7b6b5 
								
							 
						 
						
							
							
								
								Paratrization overrides existing fixtures.  
							
							... 
							
							
							
							--HG--
branch : override-fixture-via-parametrization 
							
						 
						
							2013-12-10 14:27:29 +01:00  
				
					
						
							
							
								 
						
							
								dd0da4643a 
								
							 
						 
						
							
							
								
								clarify that pytest.mark.parametrize() takes a list of argvalues and not just  
							
							... 
							
							
							
							arbitrary iterators.  Addresses issue122. 
							
						 
						
							2013-12-10 10:16:27 +01:00  
				
					
						
							
							
								 
						
							
								7766526992 
								
							 
						 
						
							
							
								
								address issue122 -- explode "params" into a list in fixture function decorators  
							
							
							
						 
						
							2013-12-09 10:48:15 +01:00  
				
					
						
							
							
								 
						
							
								5c3d692008 
								
							 
						 
						
							
							
								
								some minor internal cleanup  
							
							
							
						 
						
							2013-12-09 10:40:39 +01:00  
				
					
						
							
							
								 
						
							
								ad2ac256de 
								
							 
						 
						
							
							
								
								speed up reorder for large higher-than-function-scoped parametrizations  
							
							
							
						 
						
							2013-12-09 10:05:44 +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  
				
					
						
							
							
								 
						
							
								e67047d629 
								
							 
						 
						
							
							
								
								remove unused cache argument for re-ordering items.  
							
							
							
						 
						
							2013-12-07 21:00:33 +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