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  
				
					
						
							
							
								 
						
							
								1216a27b44 
								
							 
						 
						
							
							
								
								added docstrign to inection collection test.  
							
							
							
						 
						
							2015-12-10 15:19:08 -08:00  
				
					
						
							
							
								 
						
							
								74f7efd2a3 
								
							 
						 
						
							
							
								
								added line comparison that is pytest-sugar agnostic.  
							
							
							
						 
						
							2015-12-10 15:10:55 -08:00  
				
					
						
							
							
								 
						
							
								34db8aed34 
								
							 
						 
						
							
							
								
								added verification that test actually passed.  
							
							
							
						 
						
							2015-12-10 15:02:57 -08:00  
				
					
						
							
							
								 
						
							
								af54e09759 
								
							 
						 
						
							
							
								
								nit: fixed newline  
							
							
							
						 
						
							2015-12-10 14:46:51 -08:00  
				
					
						
							
							
								 
						
							
								dfaeefd692 
								
							 
						 
						
							
							
								
								added test to verify injection.  
							
							
							
						 
						
							2015-12-10 14:45:36 -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  
				
					
						
							
							
								 
						
							
								707226298a 
								
							 
						 
						
							
							
								
								issue1035 add test for classes setting __getattr__  
							
							
							
						 
						
							2015-10-08 09:08:32 +01: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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								e1063678f1 
								
							 
						 
						
							
							
								
								escape bytes when creating ids for parametrized values  
							
							
							
						 
						
							2015-09-22 23:18:09 -03:00  
				
					
						
							
							
								 
						
							
								3bcda48ba4 
								
							 
						 
						
							
							
								
								Merge pull request  #1009  from mdboom/deprecation-warnings  
							
							... 
							
							
							
							avoid deprecation warnings, introduce helpers. 
							
						 
						
							2015-09-17 13:37:26 +02:00  
				
					
						
							
							
								 
						
							
								7f71ce0ab2 
								
							 
						 
						
							
							
								
								Reorganize tests  
							
							
							
						 
						
							2015-09-16 16:52:37 -04:00  
				
					
						
							
							
								 
						
							
								a62d12634c 
								
							 
						 
						
							
							
								
								revert importing test module behaviour to prepend by default  
							
							
							
						 
						
							2015-09-16 22:12:20 +02:00  
				
					
						
							
							
								 
						
							
								9a84c9edb6 
								
							 
						 
						
							
							
								
								Add tests for argument formatting  
							
							
							
						 
						
							2015-09-16 11:02:48 -04:00  
				
					
						
							
							
								 
						
							
								cd475c7b27 
								
							 
						 
						
							
							
								
								minor flake8 fixes  
							
							
							
						 
						
							2015-09-13 19:55:44 +02:00  
				
					
						
							
							
								 
						
							
								19791546da 
								
							 
						 
						
							
							
								
								Add docstring.  
							
							
							
						 
						
							2015-08-31 15:11:57 +02:00  
				
					
						
							
							
								 
						
							
								885e461ae3 
								
							 
						 
						
							
							
								
								Fix overriding of fixtures with parametrization.  
							
							... 
							
							
							
							Fixes  #979 , see #926 . 
						
							2015-08-31 14:38:39 +02:00  
				
					
						
							
							
								 
						
							
								b49bedcf0c 
								
							 
						 
						
							
							
								
								Merge branch 'master' of git://github.com/Elizaveta239/pytest into Elizaveta239-master  
							
							
							
						 
						
							2015-08-28 11:10:22 +10: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  
				
					
						
							
							
								 
						
							
								2ffd37b816 
								
							 
						 
						
							
							
								
								return non-zero exit code if no tests are collected  
							
							... 
							
							
							
							Fix  #812 
Fix  #500  
						
							2015-08-18 07:35:02 -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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								36b86af4b9 
								
							 
						 
						
							
							
								
								Added more test cases  
							
							
							
						 
						
							2015-08-08 19:20:09 +02:00  
				
					
						
							
							
								 
						
							
								40fa7b25c5 
								
							 
						 
						
							
							
								
								Merge branch 'master' of git://github.com/Elizaveta239/pytest into Elizaveta239-master  
							
							... 
							
							
							
							Fixed merge conflict in CHANGELOG 
							
						 
						
							2015-08-08 18:54:53 +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  
				
					
						
							
							
								 
						
							
								657ca97dbd 
								
							 
						 
						
							
							
								
								Some refactorings after code review  
							
							
							
						 
						
							2015-08-04 00:02:03 +03:00  
				
					
						
							
							
								 
						
							
								db9809d6dc 
								
							 
						 
						
							
							
								
								Update test for error in 'indirect' parameter  
							
							
							
						 
						
							2015-08-02 23:53:44 +03:00  
				
					
						
							
							
								 
						
							
								63bac67fb5 
								
							 
						 
						
							
							
								
								Add test for bad value in argument 'indirect'  
							
							
							
						 
						
							2015-08-02 23:06:24 +03:00  
				
					
						
							
							
								 
						
							
								15b865f502 
								
							 
						 
						
							
							
								
								Rewrite test using @pytest.fixture  
							
							
							
						 
						
							2015-08-02 20:30:23 +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  
				
					
						
							
							
								 
						
							
								2ab4bf13ab 
								
							 
						 
						
							
							
								
								Document and test stacking of parametrize.  
							
							... 
							
							
							
							Closes  #815 . 
						
							2015-07-26 14:39:13 +02:00  
				
					
						
							
							
								 
						
							
								f78d87ee38 
								
							 
						 
						
							
							
								
								Issue  #751  - test.  
							
							
							
						 
						
							2015-07-25 15:38:11 +02:00  
				
					
						
							
							
								 
						
							
								df29120abe 
								
							 
						 
						
							
							
								
								Merge branch 'pytest-2.7'  
							
							... 
							
							
							
							Conflicts:
	_pytest/config.py
	_pytest/genscript.py
	_pytest/mark.py
	tox.ini 
							
						 
						
							2015-07-23 22:35:51 -03:00  
				
					
						
							
							
								 
						
							
								6af7172204 
								
							 
						 
						
							
							
								
								Merge branch 'pytest-2.7'  
							
							
							
						 
						
							2015-07-19 15:25:04 +02:00  
				
					
						
							
							
								 
						
							
								2f7d0f8bd9 
								
							 
						 
						
							
							
								
								Consider --color option in more places which deal with TerminalWriters  
							
							
							
						 
						
							2015-07-18 16:39:55 -03:00  
				
					
						
							
							
								 
						
							
								dcdc823dd2 
								
							 
						 
						
							
							
								
								Support for tests created with functools.partial  
							
							... 
							
							
							
							Fix  #811  
						
							2015-07-16 20:37:03 -03:00  
				
					
						
							
							
								 
						
							
								0f52856f99 
								
							 
						 
						
							
							
								
								Use a subdirectory in the TEMP directory to speed up tmpdir creation  
							
							... 
							
							
							
							Fix  #105  
						
							2015-07-15 20:03:58 -03:00  
				
					
						
							
							
								 
						
							
								5ec2a17f08 
								
							 
						 
						
							
							
								
								--fixtures only shows fixtures from first file  
							
							... 
							
							
							
							Fix  #833  
						
							2015-07-12 17:32:39 -03:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								9aec5cd52d 
								
							 
						 
						
							
							
								
								use runpytest() instead of runpytest_inprocess if a test can run as subprocess as well  
							
							... 
							
							
							
							--HG--
branch : testrefactor 
							
						 
						
							2015-04-28 12:05:08 +02:00  
				
					
						
							
							
								 
						
							
								db5649ec6a 
								
							 
						 
						
							
							
								
								streamline pytester API majorly:  
							
							... 
							
							
							
							- integrate conftest into pytester plugin
- introduce runpytest() to either call runpytest_inline (default) or
  runpytest_subprocess (python -m pytest)
- move testdir.inline_runsource1 to pdb tests
- strike some unneccessary methods.
- a new section "writing plugins" and some better pytester docs
--HG--
branch : testrefactor 
							
						 
						
							2015-04-28 11:54:53 +02:00  
				
					
						
							
							
								 
						
							
								a8afba054a 
								
							 
						 
						
							
							
								
								- refine lsof checking  
							
							... 
							
							
							
							- make runpytest() create an inline testing process instead of
  a subprocess one
--HG--
branch : testrefactor 
							
						 
						
							2015-04-28 11:54:46 +02:00  
				
					
						
							
							
								 
						
							
								d3e363b97a 
								
							 
						 
						
							
							
								
								- make API between runpytest() and inline_run() more similar  
							
							... 
							
							
							
							- shift a number of tests to become inline_run() tests
--HG--
branch : testrefactor 
							
						 
						
							2015-04-28 11:54:45 +02:00  
				
					
						
							
							
								 
						
							
								424e5d1394 
								
							 
						 
						
							
							
								
								make test suite more tolerable against xdist causing warnings itself (which it does  
							
							... 
							
							
							
							currently)
--HG--
branch : plugtestfix 
							
						 
						
							2015-04-27 15:06:47 +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  
				
					
						
							
							
								 
						
							
								d632a0d5c2 
								
							 
						 
						
							
							
								
								merge conftest management into PytestPluginManager  
							
							... 
							
							
							
							--HG--
branch : plugin_no_pytest 
							
						 
						
							2015-04-22 14:15:42 +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  
				
					
						
							
							
								 
						
							
								3ed3e51997 
								
							 
						 
						
							
							
								
								fix issue660: properly report fixture scope mismatches independent  
							
							... 
							
							
							
							from fixture argument ordering.
--HG--
branch : issue660 
							
						 
						
							2015-04-01 18:42:48 +02:00  
				
					
						
							
							
								 
						
							
								d2a8866bce 
								
							 
						 
						
							
							
								
								bump verrsion to python2.7, fix a too precise test for windows, regen docs  
							
							
							
						 
						
							2015-03-26 09:34:10 +01:00  
				
					
						
							
							
								 
						
							
								43e4fcf6dd 
								
							 
						 
						
							
							
								
								Raise specific MarkerError rather than generic ValueError  
							
							... 
							
							
							
							--HG--
branch : issue463 
							
						 
						
							2015-03-23 20:01:58 +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  
				
					
						
							
							
								 
						
							
								d083153548 
								
							 
						 
						
							
							
								
								fix typo  
							
							... 
							
							
							
							--HG--
branch : parametrized-fixture-override 
							
						 
						
							2015-03-02 20:18:06 +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  
				
					
						
							
							
								 
						
							
								5941b2e071 
								
							 
						 
						
							
							
								
								fix issue 655: crude workarounds around python2/3 exception leaks  
							
							
							
						 
						
							2015-01-09 19:55:49 +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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								ab005a4261 
								
							 
						 
						
							
							
								
								Functional tests for id function  
							
							... 
							
							
							
							--HG--
branch : issue351 
							
						 
						
							2014-10-08 00:11:32 +01:00  
				
					
						
							
							
								 
						
							
								b6dcfd4377 
								
							 
						 
						
							
							
								
								fix conftest related fixture visibility issue: when running with a  
							
							... 
							
							
							
							CWD outside a test package pytest would get fixture discovery wrong.
Thanks to Wolfgang Schnerring for figuring out a reproducable example.
--HG--
branch : conftest-nodeid 
							
						 
						
							2014-09-15 12:44:16 +02:00  
				
					
						
							
							
								 
						
							
								4e8438afc8 
								
							 
						 
						
							
							
								
								Simply show the node ID for verbose output  
							
							... 
							
							
							
							This strips the line number, /@\d/, from the verbose output so it is
directly the node ID of the test.  This in turn means no special logic
for accepting the line number as part of the node ID is needed when
parsing the command line. 
							
						 
						
							2014-08-01 00:29:35 +01:00  
				
					
						
							
							
								 
						
							
								0dd378da30 
								
							 
						 
						
							
							
								
								Injection of fixture doesn't work when decorated with unittest.mock.patch  
							
							... 
							
							
							
							This is a continuation of #182 
--HG--
branch : mock-unittest-252 
							
						 
						
							2014-07-26 17:26:18 +02:00  
				
					
						
							
							
								 
						
							
								1641d00cb1 
								
							 
						 
						
							
							
								
								Merge default  
							
							
							
						 
						
							2014-07-18 01:34:08 +01:00  
				
					
						
							
							
								 
						
							
								2d7a32f7ea 
								
							 
						 
						
							
							
								
								Add test case for using different modules  
							
							
							
						 
						
							2014-07-18 01:30:29 +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  
				
					
						
							
							
								 
						
							
								115f15600f 
								
							 
						 
						
							
							
								
								Add test for inter-dependent fixtures  
							
							... 
							
							
							
							Together with cc0a46a13ac4 this fixes issue 467. 
							
						 
						
							2014-06-15 19:57:52 +01: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  
				
					
						
							
							
								 
						
							
								c47835f5ec 
								
							 
						 
						
							
							
								
								Merge pull request  #158 , fixes issue 504  
							
							
							
						 
						
							2014-04-15 11:43:38 -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  
				
					
						
							
							
								 
						
							
								2ba23e8d08 
								
							 
						 
						
							
							
								
								issue504: verbose output displays node IDs for each test  
							
							... 
							
							
							
							Replace the verbose per-test reporting format of `file:line test_name RESULT`
with the node ID of the test, i.e. `file@line::class::method[param] RESULT`.
This patch does not update the examples in the docs; @hpk42 has a script
to regenerate those.
--HG--
branch : issue504 
							
						 
						
							2014-04-14 17:42:02 -04:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								e42cbc714f 
								
							 
						 
						
							
							
								
								fix wrong merge  
							
							... 
							
							
							
							--HG--
branch : nose_test_attr 
							
						 
						
							2014-04-10 12:58:10 +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  
				
					
						
							
							
								 
						
							
								bb0632c7ad 
								
							 
						 
						
							
							
								
								extend test  
							
							
							
						 
						
							2014-03-26 19:37:49 +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  
				
					
						
							
							
								 
						
							
								77e1f93ca1 
								
							 
						 
						
							
							
								
								Fixed pyflakes errors.  
							
							
							
						 
						
							2014-03-14 14:25: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  
				
					
						
							
							
								 
						
							
								41bddb48a1 
								
							 
						 
						
							
							
								
								remove unused var (fixes flakes tests)  
							
							
							
						 
						
							2013-12-16 12:38:15 +01:00  
				
					
						
							
							
								 
						
							
								b4797d6295 
								
							 
						 
						
							
							
								
								fix issue403 : allow same-name parametrized functions within a collector  
							
							
							
						 
						
							2013-12-16 07:47:59 +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  
				
					
						
							
							
								 
						
							
								7b87f7b6b5 
								
							 
						 
						
							
							
								
								Paratrization overrides existing fixtures.  
							
							... 
							
							
							
							--HG--
branch : override-fixture-via-parametrization 
							
						 
						
							2013-12-10 14:27:29 +01:00  
				
					
						
							
							
								 
						
							
								7766526992 
								
							 
						 
						
							
							
								
								address issue122 -- explode "params" into a list in fixture function decorators  
							
							
							
						 
						
							2013-12-09 10:48:15 +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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								daec4c70b8 
								
							 
						 
						
							
							
								
								refactor sorting wrt class-scopes.  This fixes issue396 and also simplifies  
							
							... 
							
							
							
							the internal sorting algorithm a bit. 
							
						 
						
							2013-12-07 19:31:27 +01:00  
				
					
						
							
							
								 
						
							
								426907eafb 
								
							 
						 
						
							
							
								
								radically simplify eq/neq with nodes by just using Pythons builtin "is" relationship.  
							
							... 
							
							
							
							The need for comparing two separately instantiated nodes seems to be historic
(related to an already-gone mode of pytest-xdist which would re-collect nodes)
and not actually needed anymore. 
							
						 
						
							2013-12-07 16:39:53 +01:00  
				
					
						
							
							
								 
						
							
								4f0879ff9b 
								
							 
						 
						
							
							
								
								refactor internal finalization mechanics such that all fixture arguments  
							
							... 
							
							
							
							in a test invocation will have a corresponding FixtureDef instance.
also fixes issue246 (again).
simplify parametrized fixture teardown by making it work lazy:
during the setup of a parametrized fixture instance any previously
setup instance which was setup with a different param is torn down
before setting up the new one. 
							
						 
						
							2013-12-07 16:37:46 +01:00  
				
					
						
							
							
								 
						
							
								cb485e5af4 
								
							 
						 
						
							
							
								
								reopen   #246  -- it turns out parametrized finalization ordering is not fully fixed -- i modified the test and marked it xfail for now.  
							
							
							
						 
						
							2013-12-04 16:09:37 +01:00  
				
					
						
							
							
								 
						
							
								817b175870 
								
							 
						 
						
							
							
								
								allow to use pytest.fixture decorator on old-style pytest_funcarg__NAME definitions.  
							
							
							
						 
						
							2013-12-04 07:16:34 +01:00  
				
					
						
							
							
								 
						
							
								0cfd873abe 
								
							 
						 
						
							
							
								
								implement index-based mechanizm for collection of parametrized tests  
							
							... 
							
							
							
							--HG--
branch : parametrize-hashable 
							
						 
						
							2013-12-03 21:05:19 +01:00  
				
					
						
							
							
								 
						
							
								d30ad3f5ce 
								
							 
						 
						
							
							
								
								fix reporting for @mock'd test functions  
							
							
							
						 
						
							2013-12-03 11:23:22 +01:00  
				
					
						
							
							
								 
						
							
								e31f40c2d0 
								
							 
						 
						
							
							
								
								fix ordering of finalizers of parametrized interdependent fixtures.  
							
							... 
							
							
							
							This fixes issue246 as reported.  Thanks Ralph Schmitt for the
precise failure example. 
							
						 
						
							2013-11-21 14:16:44 +01:00  
				
					
						
							
							
								 
						
							
								bb5f1e8173 
								
							 
						 
						
							
							
								
								refactor internal FixtureRequest handling to avoid monkeypatching.  
							
							... 
							
							
							
							One of the positive user-facing effects is that the "request" object
can now be used in closures. 
							
						 
						
							2013-11-21 12:21:52 +01:00  
				
					
						
							
							
								 
						
							
								05fbd490da 
								
							 
						 
						
							
							
								
								addresses issue246: add a test for module/function scope that shows that  
							
							... 
							
							
							
							finalizer ordering is wrong. 
							
						 
						
							2013-11-21 09:42:24 +01:00  
				
					
						
							
							
								 
						
							
								5322f057a0 
								
							 
						 
						
							
							
								
								move two fixture test modules into bigger testing/python/fixture.py  
							
							
							
						 
						
							2013-11-21 09:26:45 +01:00  
				
					
						
							
							
								 
						
							
								0a8b27ff49 
								
							 
						 
						
							
							
								
								fix ordering when mock.patch or other standard decorator-wrappings  
							
							... 
							
							
							
							are used with test methods.  This fixues issue346.  Thanks to
Ronny Pfannschmidt and Donald Stufft for helping to isolate it. 
							
						 
						
							2013-11-19 23:22:27 +01:00  
				
					
						
							
							
								 
						
							
								7210e443ee 
								
							 
						 
						
							
							
								
								Support multiple marks for individual parametrized argument set  
							
							... 
							
							
							
							--HG--
branch : multi-marks 
							
						 
						
							2013-11-01 21:10:13 -07:00  
				
					
						
							
							
								 
						
							
								bc8c4b3ebd 
								
							 
						 
						
							
							
								
								pytestconfig is now session-config as it is the same object during the  
							
							... 
							
							
							
							whole test run.  Fixes issue370 
							
						 
						
							2013-10-21 13:33:36 +02:00  
				
					
						
							
							
								 
						
							
								8ac5af2896 
								
							 
						 
						
							
							
								
								fix flakes issues and make --flakes run part of tox runs  
							
							
							
						 
						
							2013-10-12 15:39:22 +02:00  
				
					
						
							
							
								 
						
							
								d3c9927fee 
								
							 
						 
						
							
							
								
								fix regression reported by dstufft: regression when a 1-tuple ("arg",) is used  
							
							... 
							
							
							
							for specifying parametrization (the values of the parametrization were passed
nested in a tuple). 
							
						 
						
							2013-10-02 08:08:26 +02:00  
				
					
						
							
							
								 
						
							
								de35b077a2 
								
							 
						 
						
							
							
								
								disallow yield in non-yield-fixtures for now.  This is an incompataibility but we want to prepare for possibly merging fixture and yield_fixture some day.  
							
							
							
						 
						
							2013-09-30 13:56:54 +02:00  
				
					
						
							
							
								 
						
							
								086d4e4ced 
								
							 
						 
						
							
							
								
								strike keyword argument in favour of new pytest.yield_fixture decorator  
							
							
							
						 
						
							2013-09-30 13:42:39 +02:00  
				
					
						
							
							
								 
						
							
								da7133d201 
								
							 
						 
						
							
							
								
								fix some tests wrt to expecting output now that pytest does no  
							
							... 
							
							
							
							introduce unwanted "buffering" on "-s" calls. 
							
						 
						
							2013-09-27 12:28:34 +02:00  
				
					
						
							
							
								 
						
							
								3ab9b48782 
								
							 
						 
						
							
							
								
								introduce yieldctx=True in the @pytest.fixture decorator. Refactor tests and docs.  
							
							
							
						 
						
							2013-09-26 12:57:21 +02:00  
				
					
						
							
							
								 
						
							
								63a924b922 
								
							 
						 
						
							
							
								
								parametrize fails when values are unhashable - tests  
							
							... 
							
							
							
							--HG--
branch : parametrize-fails-when-values-are 
							
						 
						
							2013-09-07 02:30:09 +02:00  
				
					
						
							
							
								 
						
							
								94ee37cdb3 
								
							 
						 
						
							
							
								
								- fix issue181: --pdb now also works on collect errors.  This was  
							
							... 
							
							
							
							implemented by a slight internal refactoring and the introduction
  of a new hook ``pytest_exception_interact`` hook.
- fix issue341: introduce new experimental hook for IDEs/terminals to
  intercept debugging: ``pytest_exception_interact(node, call, report)``. 
							
						 
						
							2013-09-06 11:56:04 +02:00  
				
					
						
							
							
								 
						
							
								b879074a64 
								
							 
						 
						
							
							
								
								refs issue290 -- move and refactor the test the string/int-id parametrization test (Which xfails)  
							
							
							
						 
						
							2013-08-16 11:41:31 +02:00  
				
					
						
							
							
								 
						
							
								7d86827b5e 
								
							 
						 
						
							
							
								
								ref  #322  cleanup all teardown calling to only happen when setup succeeded.  
							
							... 
							
							
							
							don't use autouse fixtures for now because it would cause a proliferation
and overhead for the execution of every test.  Rather introduce a
node.addfinalizer(fin) to attach a finalizer to the respective node
and call it from node.setup() functions if the setup phase succeeded
(i.e. there is no setup function or it finished successfully) 
							
						 
						
							2013-08-02 09:52:40 +02:00  
				
					
						
							
							
								 
						
							
								7fc0d45a4c 
								
							 
						 
						
							
							
								
								refs  #322 : setUpClass and tearDownClass as autouse fixture and finalizer  
							
							
							
						 
						
							2013-08-01 23:48:40 +02:00  
				
					
						
							
							
								 
						
							
								2cdb54225c 
								
							 
						 
						
							
							
								
								Fix issue 336: autouse fixtures in plugins work again  
							
							... 
							
							
							
							When an autouse fixture in a plugin was encountered None was stored as nodeid
where it used to be ''.  This broke the lookup of autouse fixtures later on.
This also adds another test for the normal fixture ordering which was slightly
wrong: a fixture without location was always added at the front of the fixture
list rather then at the end of the fixtures without location but before the
fixtures with location. 
							
						 
						
							2013-08-01 18:58:28 +01:00  
				
					
						
							
							
								 
						
							
								8f24e10571 
								
							 
						 
						
							
							
								
								add changelog entry for anthon's hynek-fication of options,  
							
							... 
							
							
							
							and change the docs and tests to use the new style. 
							
						 
						
							2013-08-01 17:32:19 +02:00  
				
					
						
							
							
								 
						
							
								1280add047 
								
							 
						 
						
							
							
								
								SO-17664702: call fixture finalizers even if the fixture function  
							
							... 
							
							
							
							partially failed (finalizers would not always be called before) 
							
						 
						
							2013-07-17 10:29:11 +02:00  
				
					
						
							
							
								 
						
							
								60a53c75a6 
								
							 
						 
						
							
							
								
								some python2.5/3.3 fixes of Brianna's parametrize improvements  
							
							
							
						 
						
							2013-07-16 15:43:20 +02:00  
				
					
						
							
							
								 
						
							
								af7db5195b 
								
							 
						 
						
							
							
								
								Merged in pfctdayelise/pytest (pull request  #38 )  
							
							... 
							
							
							
							A couple of improvements to parametrize 
							
						 
						
							2013-07-16 15:30:48 +02:00  
				
					
						
							
							
								 
						
							
								589138ea71 
								
							 
						 
						
							
							
								
								re  #320  fallback to test scope if the class-scoped fixture is used in non-class-based test function  
							
							... 
							
							
							
							--HG--
branch : 320-class-scoped-fixture-caching-is-broken-if 
							
						 
						
							2013-07-06 21:30:24 +02:00  
				
					
						
							
							
								 
						
							
								e6a063ee47 
								
							 
						 
						
							
							
								
								Solve fixture ordering when loading plugins from conftest  
							
							... 
							
							
							
							Conftests are plugins with a location attached to them while other
plugins do not have a location.  When ordering fixturedefs those from
plugins without a location need to be listed first. 
							
						 
						
							2013-07-06 17:56:54 +02:00  
				
					
						
							
							
								 
						
							
								2c7613c15c 
								
							 
						 
						
							
							
								
								merge with upstream  
							
							
							
						 
						
							2013-07-06 10:06:12 +02:00  
				
					
						
							
							
								 
						
							
								c4c966683c 
								
							 
						 
						
							
							
								
								fix issue323 - parametrize() of many module-scoped params  
							
							
							
						 
						
							2013-06-28 12:57:10 +02:00  
				
					
						
							
							
								 
						
							
								345b8391c4 
								
							 
						 
						
							
							
								
								A couple of improvements to parametrize  
							
							... 
							
							
							
							- When not specifying ids, let None and bools use their native string form (like str, int, float) rather than obfuscated form used for objects
- When specifying ids, explicitly raise a ValueError if a different number of ids are specified compared to the test cases
- Add tests for both these items. 
							
						 
						
							2013-05-29 12:59:47 +10:00  
				
					
						
							
							
								 
						
							
								c294a417bd 
								
							 
						 
						
							
							
								
								allow to specify parametrize inputs as a comma-separated string  
							
							... 
							
							
							
							add Wouter to changelog and to authors 
							
						 
						
							2013-05-28 10:32:54 +02:00  
				
					
						
							
							
								 
						
							
								8a0a18e9b3 
								
							 
						 
						
							
							
								
								- add Brianna (@pfctdayelise ) to changelog and contributors  
							
							... 
							
							
							
							- fix some broken tests on py32/py33 (related to issue308 merge)
- re-format docstrings
- 
							
						 
						
							2013-05-22 15:24:58 +02:00  
				
					
						
							
							
								 
						
							
								ee65ca10f4 
								
							 
						 
						
							
							
								
								issue  #308  
							
							... 
							
							
							
							address some comments by @hpk42 on 0b9d82e :
- move tests into their own class, rename
- add test showing metafunc.parametrize called in pytest_generate_tests rather than as decorator
- add test and fix single-argname case
- convert two loops into one in parametrize()
also
- renamed 'input' to 'n', since 'input' is a built-in 
							
						 
						
							2013-05-20 12:52:20 +10:00  
				
					
						
							
							
								 
						
							
								5373a63008 
								
							 
						 
						
							
							
								
								issue  #308  
							
							... 
							
							
							
							first attempt, mark individual parametrize test instances with other marks (like xfail) 
							
						 
						
							2013-05-17 18:46:36 +10:00  
				
					
						
							
							
								 
						
							
								56aa9962fc 
								
							 
						 
						
							
							
								
								allow fixture functions to be implemented as context managers:  
							
							... 
							
							
							
							@pytest.fixture
def myfix():
    # setup
    yield 1
    # teardown 
							
						 
						
							2013-05-05 14:48:37 +02:00  
				
					
						
							
							
								 
						
							
								c5f9958783 
								
							 
						 
						
							
							
								
								never consider a fixture function for test function collection  
							
							
							
						 
						
							2013-04-29 10:31:51 +02:00  
				
					
						
							
							
								 
						
							
								b2cb93e06d 
								
							 
						 
						
							
							
								
								allow re-running of a test item (as exercised by the  
							
							... 
							
							
							
							pytest-rerunfailures plugins) by re-initializing and removing
request/funcargs information in runtestprotocol() - which is a slightly
odd place to add funcarg-related functionality but it allows all
pytest_runtest_setup/teardown hooks to properly see a valid
request/funcarg content on test items. 
							
						 
						
							2013-04-22 10:35:48 +02:00  
				
					
						
							
							
								 
						
							
								c93fbb0e57 
								
							 
						 
						
							
							
								
								Load conftest files in the correct order initially  
							
							... 
							
							
							
							When the conftest.py files are looked for intially they got loaded
starting from the subdir ending at the parent dir(s).  Later on during
collection any conftest.py files are loaded starting from the parent
dir ending at the subdir.  Due to how extending fixtures works the
latter is correct as otherwise the wrong fixture will be available.
So this changes the initial conftest loading to start at the root and
go towards the subdir.
This does also affect the order of other hooks, hence the order of the
reporting being different in testing/test_terminal.py. 
							
						 
						
							2013-04-18 12:24:53 +01:00  
				
					
						
							
							
								 
						
							
								0dd05023b8 
								
							 
						 
						
							
							
								
								fix issue 251 - report a skip instead of ignoring classes with init  
							
							
							
						 
						
							2013-02-15 10:18:00 +01:00  
				
					
						
							
							
								 
						
							
								857c99d354 
								
							 
						 
						
							
							
								
								fix py32 incompatible syntax  
							
							
							
						 
						
							2013-02-14 12:17:23 +01:00  
				
					
						
							
							
								 
						
							
								d0e18ac63f 
								
							 
						 
						
							
							
								
								issue250 unicode/str mixes in parametrization names and values now works  
							
							
							
						 
						
							2013-02-12 23:30:34 +01:00  
				
					
						
							
							
								 
						
							
								570ad36eaf 
								
							 
						 
						
							
							
								
								fix parametrized testid to provide for uniqueness  
							
							
							
						 
						
							2013-02-05 17:41:45 +01:00  
				
					
						
							
							
								 
						
							
								1d7c71884e 
								
							 
						 
						
							
							
								
								Remove check for "_" prefix on python functions (use python_functions)  
							
							... 
							
							
							
							(See IRC hpk 2012-11-27 14:56: after the python_functions customization
 was introduced, it makes sense to disregard the preliminary "_" check) 
							
						 
						
							2012-11-27 16:58:08 +00:00  
				
					
						
							
							
								 
						
							
								f263f54889 
								
							 
						 
						
							
							
								
								make yielded tests participate in the autouse protocol  
							
							
							
						 
						
							2012-11-19 22:17:59 +01:00  
				
					
						
							
							
								 
						
							
								d66ff7e63e 
								
							 
						 
						
							
							
								
								fix autouse invocation (off-by-one error), relates to issue in moinmoin test suite  
							
							
							
						 
						
							2012-11-19 22:17:55 +01:00  
				
					
						
							
							
								 
						
							
								b940ed11a0 
								
							 
						 
						
							
							
								
								fix issue226 - LIFO ordering for fixture-added teardowns  
							
							
							
						 
						
							2012-11-16 10:03:51 +01:00  
				
					
						
							
							
								 
						
							
								dba2a8bc64 
								
							 
						 
						
							
							
								
								fix issue217 - to support @mock.patch with pytest funcarg-fixtures, also split out python integration tests into python/integration.py and fix nose/mark tests  
							
							
							
						 
						
							2012-11-06 11:04:11 +01:00  
				
					
						
							
							
								 
						
							
								ba9b27fcd3 
								
							 
						 
						
							
							
								
								fix issue215 - refactor test_python.py into multiple files:  
							
							... 
							
							
							
							- python/collect.py cotaining the core collection nodes
- python/fixture.py containing funcargs/fixture code
- python/metafunc.py generate_tests and metafunc usage
- python/raises.py the pytest.raises implementation 
							
						 
						
							2012-11-02 16:04:57 +01:00