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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								4b9dbd3920 
								
							 
						 
						
							
							
								
								remove unused line  
							
							
							
						 
						
							2013-12-05 14:40:50 +01:00  
				
					
						
							
							
								 
						
							
								98c6ced46e 
								
							 
						 
						
							
							
								
								refactor and document parametrized sorting code.  
							
							
							
						 
						
							2013-12-05 06:09:29 +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  
				
					
						
							
							
								 
						
							
								2e90aaf7af 
								
							 
						 
						
							
							
								
								remove _fixturestack attribute now that we have a proper request->subrequest->subrequest chain.  
							
							
							
						 
						
							2013-11-21 13:15:32 +01:00  
				
					
						
							
							
								 
						
							
								238b890d9b 
								
							 
						 
						
							
							
								
								avoid maintaining a fixturestack  
							
							
							
						 
						
							2013-11-21 12:42:22 +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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								e2c4730e17 
								
							 
						 
						
							
							
								
								correctly check for fixturedef when  merging  
							
							... 
							
							
							
							--HG--
branch : fix-fixturedef-merge 
							
						 
						
							2013-11-13 18:25:55 +01:00  
				
					
						
							
							
								 
						
							
								846cf781a1 
								
							 
						 
						
							
							
								
								use deepest fixturedef for fixture closure  
							
							... 
							
							
							
							--HG--
branch : multi-level-fixture-deps-override 
							
						 
						
							2013-11-12 13:45:36 +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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								99783b6fba 
								
							 
						 
						
							
							
								
								refs  #335 : clarify that the exception info returned by pytest.raises is a py.code.ExceptionInfo()  
							
							
							
						 
						
							2013-08-01 11:19:47 +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  
				
					
						
							
							
								 
						
							
								c4c966683c 
								
							 
						 
						
							
							
								
								fix issue323 - parametrize() of many module-scoped params  
							
							
							
						 
						
							2013-06-28 12:57:10 +02:00  
				
					
						
							
							
								 
						
							
								469830fffa 
								
							 
						 
						
							
							
								
								some internal renaming to make more sense of the sorting algo,  
							
							... 
							
							
							
							no semantical changes. 
							
						 
						
							2013-06-28 12:54:10 +02:00  
				
					
						
							
							
								 
						
							
								3bcd3317ad 
								
							 
						 
						
							
							
								
								support unittest setUpModule/tearDownModule  
							
							
							
						 
						
							2013-06-20 14:43:42 +00: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  
				
					
						
							
							
								 
						
							
								0dd05023b8 
								
							 
						 
						
							
							
								
								fix issue 251 - report a skip instead of ignoring classes with init  
							
							
							
						 
						
							2013-02-15 10:18:00 +01:00  
				
					
						
							
							
								 
						
							
								d0e18ac63f 
								
							 
						 
						
							
							
								
								issue250 unicode/str mixes in parametrization names and values now works  
							
							
							
						 
						
							2013-02-12 23:30:34 +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  
				
					
						
							
							
								 
						
							
								b97de57ebe 
								
							 
						 
						
							
							
								
								improve docstring for metafunc.parametrize()  
							
							
							
						 
						
							2012-11-21 10:13:44 +01: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  
				
					
						
							
							
								 
						
							
								2ef350aede 
								
							 
						 
						
							
							
								
								getting rid of redundant "active" attribute  
							
							
							
						 
						
							2012-11-19 12:42:10 +01:00  
				
					
						
							
							
								 
						
							
								b940ed11a0 
								
							 
						 
						
							
							
								
								fix issue226 - LIFO ordering for fixture-added teardowns  
							
							
							
						 
						
							2012-11-16 10:03:51 +01:00  
				
					
						
							
							
								 
						
							
								5b64b0130d 
								
							 
						 
						
							
							
								
								fix typo (thanks Thomas Waldmann)  
							
							
							
						 
						
							2012-11-14 09:40:01 +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  
				
					
						
							
							
								 
						
							
								ca281b7c1b 
								
							 
						 
						
							
							
								
								remove unused code  
							
							
							
						 
						
							2012-11-02 16:04:56 +01:00  
				
					
						
							
							
								 
						
							
								fb173a97a8 
								
							 
						 
						
							
							
								
								extended - fix issue214 - ignore attribute-access errors with objects in test modules that can blow up (for example flask's request object)  
							
							
							
						 
						
							2012-10-31 17:00:55 +01:00  
				
					
						
							
							
								 
						
							
								e7e5ee805f 
								
							 
						 
						
							
							
								
								fix issue 214 - gracefully handle proxy objects that look like fixtures  
							
							
							
						 
						
							2012-10-31 17:00:43 +01:00  
				
					
						
							
							
								 
						
							
								fce13c3e46 
								
							 
						 
						
							
							
								
								re-allow to parametrize with values that don't support __eq__ (closes issue213)  
							
							
							
						 
						
							2012-10-28 14:52:43 +01:00  
				
					
						
							
							
								 
						
							
								05c86aeb28 
								
							 
						 
						
							
							
								
								make sure ihook uses a node's fspath - important for hooks  
							
							... 
							
							
							
							e.g. during a Module's collect to pick up conftest.py files
residing in the same dir 
							
						 
						
							2012-10-22 16:12:22 +02:00  
				
					
						
							
							
								 
						
							
								f28f073c7c 
								
							 
						 
						
							
							
								
								fix teardown-ordering for parametrized setups/teardowns  
							
							
							
						 
						
							2012-10-22 12:16:54 +02:00  
				
					
						
							
							
								 
						
							
								97f03edcd6 
								
							 
						 
						
							
							
								
								fix issue205 - nested conftest to pickup pycollect_makemodule - relates to the two  
							
							... 
							
							
							
							reports of a failing doc/en/example/py2py3. 
							
						 
						
							2012-10-22 10:17:50 +02:00  
				
					
						
							
							
								 
						
							
								f41f7fda68 
								
							 
						 
						
							
							
								
								improve --markers output  
							
							
							
						 
						
							2012-10-20 13:56:53 +02:00  
				
					
						
							
							
								 
						
							
								9ed127b5da 
								
							 
						 
						
							
							
								
								fix issue203 - fixture functions with a scope=function should have a "self" that points to the actual instance with which the test functions run.  
							
							
							
						 
						
							2012-10-20 09:59:20 +02:00  
				
					
						
							
							
								 
						
							
								586befb945 
								
							 
						 
						
							
							
								
								make usefixtures appear in py.test --markers output  
							
							
							
						 
						
							2012-10-19 10:17:13 +02:00  
				
					
						
							
							
								 
						
							
								b0b6695538 
								
							 
						 
						
							
							
								
								improve automatic id generation for parametrized tests  
							
							
							
						 
						
							2012-10-19 10:07:13 +02:00  
				
					
						
							
							
								 
						
							
								024df6e00b 
								
							 
						 
						
							
							
								
								some more finalization of docs  
							
							
							
						 
						
							2012-10-19 10:07:11 +02:00  
				
					
						
							
							
								 
						
							
								64544bee1a 
								
							 
						 
						
							
							
								
								fix trial tests  
							
							
							
						 
						
							2012-10-18 15:09:20 +02:00  
				
					
						
							
							
								 
						
							
								7c8755cc89 
								
							 
						 
						
							
							
								
								refine docs, fix a marker/keywords bit, and add a test that request.keywords points to node.keywords.  
							
							
							
						 
						
							2012-10-18 15:06:55 +02:00  
				
					
						
							
							
								 
						
							
								7d747a1cde 
								
							 
						 
						
							
							
								
								remove .markers attribute which was added in development and after 2.2.4  
							
							... 
							
							
							
							so never released.  Rather extend keywords to also exist on nodes. Assigning
to node.keywords will make the value appear on all subchildren's
keywords. 
							
						 
						
							2012-10-18 13:52:32 +02:00  
				
					
						
							
							
								 
						
							
								cf17f1d628 
								
							 
						 
						
							
							
								
								fixing the fix of the last commit  
							
							
							
						 
						
							2012-10-17 13:45:03 +02:00  
				
					
						
							
							
								 
						
							
								67de2c53ac 
								
							 
						 
						
							
							
								
								fix issue198 - detection of fixtures from conftest.py files in deeper nested dir structures with certain invocations  
							
							
							
						 
						
							2012-10-17 13:42:40 +02:00  
				
					
						
							
							
								 
						
							
								26ab80c4cd 
								
							 
						 
						
							
							
								
								fix and test --fixtures location information  
							
							
							
						 
						
							2012-10-17 13:12:33 +02:00  
				
					
						
							
							
								 
						
							
								20849a44f5 
								
							 
						 
						
							
							
								
								improve --fixtures output with per-plugin grouping  and hiding underscore names in non-verbose mode, re-introduce --funcargs for compatibiliy  
							
							
							
						 
						
							2012-10-17 12:57:05 +02:00  
				
					
						
							
							
								 
						
							
								51644a116c 
								
							 
						 
						
							
							
								
								remove unused code  
							
							
							
						 
						
							2012-10-17 11:50:32 +02:00  
				
					
						
							
							
								 
						
							
								98513b995a 
								
							 
						 
						
							
							
								
								simplify/integrate fixturemapper into FixtureManager  
							
							... 
							
							
							
							also fix jstests test failures 
							
						 
						
							2012-10-17 11:20:45 +02:00  
				
					
						
							
							
								 
						
							
								dc4e205876 
								
							 
						 
						
							
							
								
								typographic fixes, little simplification  
							
							
							
						 
						
							2012-10-17 09:21:04 +02:00  
				
					
						
							
							
								 
						
							
								2855a2f6cb 
								
							 
						 
						
							
							
								
								remove outdated IMPL.txt and move up-to-date doc bits to FixtureMapper class.  
							
							
							
						 
						
							2012-10-16 16:27:51 +02:00  
				
					
						
							
							
								 
						
							
								cc2337af3a 
								
							 
						 
						
							
							
								
								refine parsefactories interface, fix two_classes test originally reported by Alex Okrushko, also add a few more tests to make sure autouse-fixtures are properly distinguished  
							
							
							
						 
						
							2012-10-16 16:13:12 +02:00  
				
					
						
							
							
								 
						
							
								ab4183d400 
								
							 
						 
						
							
							
								
								strike another use of getfuncargnames() and rename FixtureDef.fixturenames to "argnames" because it's really just the fixture function arguments  
							
							
							
						 
						
							2012-10-16 14:19:38 +02:00  
				
					
						
							
							
								 
						
							
								37965657d0 
								
							 
						 
						
							
							
								
								make factorydeflist immutable by using an index  
							
							
							
						 
						
							2012-10-16 13:59:12 +02:00  
				
					
						
							
							
								 
						
							
								ccaa1af534 
								
							 
						 
						
							
							
								
								use FixtureInfo from FixtureRequest  
							
							
							
						 
						
							2012-10-16 13:48:00 +02:00  
				
					
						
							
							
								 
						
							
								2f3bbdafda 
								
							 
						 
						
							
							
								
								use fixturemapper/fixtureinfo from Function objects  
							
							
							
						 
						
							2012-10-16 13:48:00 +02:00  
				
					
						
							
							
								 
						
							
								021c087701 
								
							 
						 
						
							
							
								
								implement fixture information stored on the parentnode of functions  
							
							... 
							
							
							
							to be reused by metafunc mechanics and Function setup 
							
						 
						
							2012-10-16 13:47:59 +02:00  
				
					
						
							
							
								 
						
							
								4541456a96 
								
							 
						 
						
							
							
								
								add plan for better fixture implementation, an xfailing test  
							
							... 
							
							
							
							and a slight refactoring of Metafunc tests/creation 
							
						 
						
							2012-10-16 13:47:59 +02:00  
				
					
						
							
							
								 
						
							
								f5d796b093 
								
							 
						 
						
							
							
								
								improve docs further, refine unittest docs, rename ``autoactive`` to ``autouse``  
							
							... 
							
							
							
							to better match ``@pytest.mark.usefixtures`` naming. 
							
						 
						
							2012-10-12 14:52:36 +02:00  
				
					
						
							
							
								 
						
							
								0594265adc 
								
							 
						 
						
							
							
								
								fix output of --fixtures for @pytest.fixture defined functions.  
							
							
							
						 
						
							2012-10-09 16:49:04 +02:00  
				
					
						
							
							
								 
						
							
								fb3af07ef4 
								
							 
						 
						
							
							
								
								try to move docs to a more releasable state, also refine  
							
							... 
							
							
							
							release announce and a few coding bits 
							
						 
						
							2012-10-09 14:35:17 +02:00  
				
					
						
							
							
								 
						
							
								df643f65f0 
								
							 
						 
						
							
							
								
								remove support for @pytest.fixture on classes, to be reserved for future use:  
							
							... 
							
							
							
							Fixture-classes could offer setup/teardown/addoption/configure methods
and provide higher level support.  Preliminary allowing it to work on classes
may make introducing it harder. 
							
						 
						
							2012-10-08 11:22:31 +02:00  
				
					
						
							
							
								 
						
							
								d630d02c5b 
								
							 
						 
						
							
							
								
								remove pytest.setup usage  
							
							
							
						 
						
							2012-10-08 08:34:21 +02:00  
				
					
						
							
							
								 
						
							
								30b10a6950 
								
							 
						 
						
							
							
								
								- fix doc references, refactor fixtures docs to more quickly start  
							
							... 
							
							
							
							with examples instead of big text blobgs
- also silence -q and -qq reporting some more 
							
						 
						
							2012-10-07 13:06:17 +02:00  
				
					
						
							
							
								 
						
							
								cda84fb566 
								
							 
						 
						
							
							
								
								- allow to use fixtures directly, i.e. without ()  
							
							... 
							
							
							
							- also allow scope to be determined by a dynamic function 
							
						 
						
							2012-10-06 21:03:55 +02:00  
				
					
						
							
							
								 
						
							
								d3893dd5d1 
								
							 
						 
						
							
							
								
								allow metafunc.parametrize(scope=...) calls to override the scope of a Fixture function definition.  This is useful for cases where you want to dynamically  
							
							... 
							
							
							
							set scope and parametrization for a fixture instead of statically declaring
it on the fixture function. 
							
						 
						
							2012-10-06 21:01:13 +02:00  
				
					
						
							
							
								 
						
							
								55a8bfd174 
								
							 
						 
						
							
							
								
								fix issue197 - in case a function is parametrized with zero arguments,  
							
							... 
							
							
							
							skip it during setup 
							
						 
						
							2012-10-06 11:34:06 +02:00  
				
					
						
							
							
								 
						
							
								d8c365ef2c 
								
							 
						 
						
							
							
								
								implement pytest.mark.usefixtures and ini-file usefixtures setting  
							
							... 
							
							
							
							and also refine fixture docs a bit - fixtures.txt should now mostly
reflect the current state of the implementation 
							
						 
						
							2012-10-05 19:20:40 +02:00  
				
					
						
							
							
								 
						
							
								d1a3f5c3a6 
								
							 
						 
						
							
							
								
								make the default non-error pass simpler and faster, refine error reporting by presenting "fixture" tracebacks  
							
							
							
						 
						
							2012-10-05 14:24:45 +02:00  
				
					
						
							
							
								 
						
							
								bb07ba7807 
								
							 
						 
						
							
							
								
								rename a number of internal and externally visible variables to use the fixture name  
							
							... 
							
							
							
							rather than funcargs.  Introduce .funcargnames compatibility attribute for backward compat. 
							
						 
						
							2012-10-05 14:24:44 +02:00  
				
					
						
							
							
								 
						
							
								8282efbb40 
								
							 
						 
						
							
							
								
								internally unify setup and fixture code, making setup a shortcut to fixture(autoactive=True)  
							
							
							
						 
						
							2012-10-05 10:21:35 +02:00  
				
					
						
							
							
								 
						
							
								9251e747af 
								
							 
						 
						
							
							
								
								rename pytest.factory usages into pytest.fixture ones  
							
							
							
						 
						
							2012-10-05 10:21:35 +02:00  
				
					
						
							
							
								 
						
							
								5173647b4d 
								
							 
						 
						
							
							
								
								fixes to against python3.3  
							
							
							
						 
						
							2012-10-01 10:14:54 +02:00  
				
					
						
							
							
								 
						
							
								57a832812b 
								
							 
						 
						
							
							
								
								remove unneccessary internal __request__ funcarg.  
							
							
							
						 
						
							2012-10-01 09:23:39 +02:00  
				
					
						
							
							
								 
						
							
								bee7543716 
								
							 
						 
						
							
							
								
								move Item.applymarker to Node, and defer to it from Funcargrequest.applymarker  
							
							
							
						 
						
							2012-09-30 22:17:33 +02:00  
				
					
						
							
							
								 
						
							
								dbe66f468a 
								
							 
						 
						
							
							
								
								ensure proper calling of finalizers in case of parametrization on classes  
							
							
							
						 
						
							2012-09-26 12:24:04 +02:00  
				
					
						
							
							
								 
						
							
								a18fd61a20 
								
							 
						 
						
							
							
								
								back out accidental changes introduced by last patch  
							
							
							
						 
						
							2012-09-25 15:13:58 +02:00  
				
					
						
							
							
								 
						
							
								a1c3d60747 
								
							 
						 
						
							
							
								
								add an xfail-ed test for a potential future "enabled" parameter to setup functions  
							
							
							
						 
						
							2012-09-25 15:04:30 +02:00