Kale Kundert
							
						 
						
							 
							
							
							
							
								
							
							
								6f5e1e386a 
								
							 
						 
						
							
							
								
								Add a convenient and correct way to compare floats.  
							
							 
							
							
							
						 
						
							2016-03-07 10:10:54 -08:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								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  
						
					 
				
					
						
							
							
								 
								Matt Bachmann
							
						 
						
							 
							
							
							
							
								
							
							
								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  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								24d3e01548 
								
							 
						 
						
							
							
								
								pytest.fail with non-ascii characters raises an internal pytest error  
							
							 
							
							... 
							
							
							
							Fix  #1178  
							
						 
						
							2016-03-05 16:09:01 -03:00  
						
					 
				
					
						
							
							
								 
								Anatoly Bubenkov
							
						 
						
							 
							
							
							
							
								
							
							
								cf9a09e988 
								
							 
						 
						
							
							
								
								catch IndexError exceptions when getting exception source location  
							
							 
							
							
							
						 
						
							2016-02-26 08:18:12 -04:00  
						
					 
				
					
						
							
							
								 
								Georgy Dyuldin
							
						 
						
							 
							
							
							
							
								
							
							
								79722ae89b 
								
							 
						 
						
							
							
								
								Add expected exceptions to 'DID NOT RAISE' msg  
							
							 
							
							
							
						 
						
							2016-02-03 14:12:41 +03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								a912d3745b 
								
							 
						 
						
							
							
								
								Moved py.code code over to py.test  
							
							 
							
							... 
							
							
							
							Fix  #103  
							
						 
						
							2016-01-25 23:18:04 -02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								7b13c4bec0 
								
							 
						 
						
							
							
								
								Fix flakes  
							
							 
							
							
							
						 
						
							2016-01-14 21:01:57 -02:00  
						
					 
				
					
						
							
							
								 
								aselus-hub
							
						 
						
							 
							
							
							
							
								
							
							
								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  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								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  
						
					 
				
					
						
							
							
								 
								Florian Bruhin
							
						 
						
							 
							
							
							
							
								
							
							
								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  
						
					 
				
					
						
							
							
								 
								Florian Bruhin
							
						 
						
							 
							
							
							
							
								
							
							
								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  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								311b0a9683 
								
							 
						 
						
							
							
								
								Fix situation where a traceback entry "path" returns a str object  
							
							 
							
							... 
							
							
							
							Fix  #1133  
							
						 
						
							2015-10-16 20:18:14 -03:00  
						
					 
				
					
						
							
							
								 
								Michael Birtwell
							
						 
						
							 
							
							
							
							
								
							
							
								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  
						
					 
				
					
						
							
							
								 
								TomV
							
						 
						
							 
							
							
							
							
								
							
							
								88c8dd96f9 
								
							 
						 
						
							
							
								
								issue1035 Override inspect.isclass for python 2.6  
							
							 
							
							
							
						 
						
							2015-10-09 19:44:47 +01:00  
						
					 
				
					
						
							
							
								 
								Demian Brecht
							
						 
						
							 
							
							
							
							
								
							
							
								493530ec6d 
								
							 
						 
						
							
							
								
								typo fix, changed position of context manager notes  
							
							 
							
							
							
						 
						
							2015-10-05 12:13:25 -07:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								5171d167ce 
								
							 
						 
						
							
							
								
								Move "note" to the end of the main text  
							
							 
							
							... 
							
							
							
							Fix  #1097  
							
						 
						
							2015-10-02 18:14:17 -03:00  
						
					 
				
					
						
							
							
								 
								Demian Brecht
							
						 
						
							 
							
							
							
							
								
							
							
								2981bece55 
								
							 
						 
						
							
							
								
								pyflakes fix  
							
							 
							
							
							
						 
						
							2015-10-02 13:03:43 -07:00  
						
					 
				
					
						
							
							
								 
								Demian Brecht
							
						 
						
							 
							
							
							
							
								
							
							
								fd211bf490 
								
							 
						 
						
							
							
								
								Add a note about usage of the context manager  
							
							 
							
							... 
							
							
							
							Addesses #1097  
							
						 
						
							2015-10-02 12:40:58 -07:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								f3cee8f0b5 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into param-ids-fix  
							
							 
							
							
							
						 
						
							2015-10-01 07:58:55 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								d1e00f6e19 
								
							 
						 
						
							
							
								
								Detect dynamic code explicitly in filter_traceback  
							
							 
							
							
							
						 
						
							2015-09-30 17:32:49 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								c9480c5b8b 
								
							 
						 
						
							
							
								
								Move imports outside _escape_bytes as suggested in review  
							
							 
							
							
							
						 
						
							2015-09-30 17:02:19 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								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  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								b64470443f 
								
							 
						 
						
							
							
								
								Fix SystemError when using unicode_escape on Python 3  
							
							 
							
							... 
							
							
							
							Fix  #1087  
							
						 
						
							2015-09-29 18:20:30 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								8633c4cefd 
								
							 
						 
						
							
							
								
								Fix encoding errors for parametrized tests with unicode parameters in py2  
							
							 
							
							... 
							
							
							
							Fix  #1085  
							
						 
						
							2015-09-29 17:57:49 -03:00  
						
					 
				
					
						
							
							
								 
								holger krekel
							
						 
						
							 
							
							
							
							
								
							
							
								1c0ffc5caf 
								
							 
						 
						
							
							
								
								seems like pypy's callable builtin calls __getattr__ so we do the check  
							
							 
							
							... 
							
							
							
							later. 
							
						 
						
							2015-09-28 14:02:30 +02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								e1063678f1 
								
							 
						 
						
							
							
								
								escape bytes when creating ids for parametrized values  
							
							 
							
							
							
						 
						
							2015-09-22 23:18:09 -03:00  
						
					 
				
					
						
							
							
								 
								holger krekel
							
						 
						
							 
							
							
							
							
								
							
							
								ca460e11e6 
								
							 
						 
						
							
							
								
								Merge pull request  #1051  from Akasurde/issue_1027  
							
							 
							
							... 
							
							
							
							Added minor documentation change in python.py 
							
						 
						
							2015-09-22 17:09:25 +02:00  
						
					 
				
					
						
							
							
								 
								Abhijeet Kasurde
							
						 
						
							 
							
							
							
							
								
							
							
								dc1ce51ac2 
								
							 
						 
						
							
							
								
								Added minor documentation change  
							
							 
							
							... 
							
							
							
							Signed-off-by: Abhijeet Kasurde <akasurde@redhat.com> 
							
						 
						
							2015-09-22 20:15:49 +05:30  
						
					 
				
					
						
							
							
								 
								holger krekel (rather uses bitbucket/hpk42)
							
						 
						
							 
							
							
							
							
								
							
							
								3bcda48ba4 
								
							 
						 
						
							
							
								
								Merge pull request  #1009  from mdboom/deprecation-warnings  
							
							 
							
							... 
							
							
							
							avoid deprecation warnings, introduce helpers. 
							
						 
						
							2015-09-17 13:37:26 +02:00  
						
					 
				
					
						
							
							
								 
								holger krekel
							
						 
						
							 
							
							
							
							
								
							
							
								a62d12634c 
								
							 
						 
						
							
							
								
								revert importing test module behaviour to prepend by default  
							
							 
							
							
							
						 
						
							2015-09-16 22:12:20 +02:00  
						
					 
				
					
						
							
							
								 
								Michael Droettboom
							
						 
						
							 
							
							
							
							
								
							
							
								bf74401fd3 
								
							 
						 
						
							
							
								
								Use __code__.co_argcount  
							
							 
							
							
							
						 
						
							2015-09-16 11:05:54 -04:00  
						
					 
				
					
						
							
							
								 
								Michael Droettboom
							
						 
						
							 
							
							
							
							
								
							
							
								08a572086b 
								
							 
						 
						
							
							
								
								Fix lookup of special values  
							
							 
							
							
							
						 
						
							2015-09-16 11:02:36 -04:00  
						
					 
				
					
						
							
							
								 
								Michael Droettboom
							
						 
						
							 
							
							
							
							
								
							
							
								9c19728d2b 
								
							 
						 
						
							
							
								
								Fix checking for args  
							
							 
							
							
							
						 
						
							2015-09-16 06:45:51 -04:00  
						
					 
				
					
						
							
							
								 
								Michael Droettboom
							
						 
						
							 
							
							
							
							
								
							
							
								859259ddae 
								
							 
						 
						
							
							
								
								Simplify  
							
							 
							
							
							
						 
						
							2015-09-16 06:43:16 -04:00  
						
					 
				
					
						
							
							
								 
								Michael Droettboom
							
						 
						
							 
							
							
							
							
								
							
							
								a0cefb3213 
								
							 
						 
						
							
							
								
								Use inspect.signature instead of inspect.getargspec  
							
							 
							
							
							
						 
						
							2015-09-16 06:33:53 -04:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								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  
						
					 
				
					
						
							
							
								 
								Florian Bruhin
							
						 
						
							 
							
							
							
							
								
							
							
								885e461ae3 
								
							 
						 
						
							
							
								
								Fix overriding of fixtures with parametrization.  
							
							 
							
							... 
							
							
							
							Fixes  #979 , see #926 . 
							
						 
						
							2015-08-31 14:38:39 +02:00  
						
					 
				
					
						
							
							
								 
								elizabeth
							
						 
						
							 
							
							
							
							
								
							
							
								e67d66a5d4 
								
							 
						 
						
							
							
								
								Merge branch 'pytest-dev'  
							
							 
							
							... 
							
							
							
							# Conflicts:
#	AUTHORS 
							
						 
						
							2015-08-24 22:55:11 +03:00  
						
					 
				
					
						
							
							
								 
								elizabeth
							
						 
						
							 
							
							
							
							
								
							
							
								06585f5bdd 
								
							 
						 
						
							
							
								
								Always report error about parametrize data that doesn't correspond to fixtures in test functions.  
							
							 
							
							
							
						 
						
							2015-08-23 13:42:40 +03:00  
						
					 
				
					
						
							
							
								 
								Markus Unterwaditzer
							
						 
						
							 
							
							
							
							
								
							
							
								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  
						
					 
				
					
						
							
							
								 
								TomV
							
						 
						
							 
							
							
							
							
								
							
							
								353360dbe5 
								
							 
						 
						
							
							
								
								use local isclass  
							
							 
							
							
							
						 
						
							2015-08-09 00:11:15 +01:00  
						
					 
				
					
						
							
							
								 
								TomV
							
						 
						
							 
							
							
							
							
								
							
							
								3497aa0766 
								
							 
						 
						
							
							
								
								check nose.istest __test__ attr issue526  
							
							 
							
							
							
						 
						
							2015-08-09 00:11:15 +01:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								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  
						
					 
				
					
						
							
							
								 
								Florian Bruhin
							
						 
						
							 
							
							
							
							
								
							
							
								4e21d1d77b 
								
							 
						 
						
							
							
								
								Move enum import and adjust comments.  
							
							 
							
							
							
						 
						
							2015-08-08 15:25:10 +02:00  
						
					 
				
					
						
							
							
								 
								Florian Bruhin
							
						 
						
							 
							
							
							
							
								
							
							
								84fdba129a 
								
							 
						 
						
							
							
								
								More style changes.  
							
							 
							
							
							
						 
						
							2015-08-08 12:57:54 +02:00  
						
					 
				
					
						
							
							
								 
								Florian Bruhin
							
						 
						
							 
							
							
							
							
								
							
							
								18125c7d1f 
								
							 
						 
						
							
							
								
								Clean up type comparisons.  
							
							 
							
							
							
						 
						
							2015-08-07 23:10:22 +02:00  
						
					 
				
					
						
							
							
								 
								Florian Bruhin
							
						 
						
							 
							
							
							
							
								
							
							
								b59376bea4 
								
							 
						 
						
							
							
								
								Alert user about other parametrize spellings.  
							
							 
							
							
							
						 
						
							2015-08-07 07:51:59 +02:00  
						
					 
				
					
						
							
							
								 
								Florian Bruhin
							
						 
						
							 
							
							
							
							
								
							
							
								13c5456868 
								
							 
						 
						
							
							
								
								Generate parametrize IDs for enum/re/class objects.  
							
							 
							
							
							
						 
						
							2015-08-07 07:37:59 +02:00  
						
					 
				
					
						
							
							
								 
								elizabeth
							
						 
						
							 
							
							
							
							
								
							
							
								f7bacd169e 
								
							 
						 
						
							
							
								
								Update docs  
							
							 
							
							
							
						 
						
							2015-08-04 00:48:41 +03:00  
						
					 
				
					
						
							
							
								 
								elizabeth
							
						 
						
							 
							
							
							
							
								
							
							
								657ca97dbd 
								
							 
						 
						
							
							
								
								Some refactorings after code review  
							
							 
							
							
							
						 
						
							2015-08-04 00:02:03 +03:00  
						
					 
				
					
						
							
							
								 
								elizabeth
							
						 
						
							 
							
							
							
							
								
							
							
								9846953597 
								
							 
						 
						
							
							
								
								Support for python 2.6  
							
							 
							
							
							
						 
						
							2015-08-02 17:28:27 +03:00  
						
					 
				
					
						
							
							
								 
								elizabeth
							
						 
						
							 
							
							
							
							
								
							
							
								2fc7aede0b 
								
							 
						 
						
							
							
								
								Request  #714 : Apply indirect=True on particular argnames  
							
							 
							
							
							
						 
						
							2015-08-02 16:40:40 +03:00  
						
					 
				
					
						
							
							
								 
								Eric Hunsberger
							
						 
						
							 
							
							
							
							
								
							
							
								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  
						
					 
				
					
						
							
							
								 
								jakubo
							
						 
						
							 
							
							
							
							
								
							
							
								e8f4819876 
								
							 
						 
						
							
							
								
								Test file run twice fails if it contains marked class  #683  
							
							 
							
							
							
						 
						
							2015-07-26 12:15:29 +02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								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  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								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  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								31cfbac1f4 
								
							 
						 
						
							
							
								
								Fix autouse fixtures defined in a TestCase subclass  
							
							 
							
							
							
						 
						
							2015-07-20 19:28:54 -03:00  
						
					 
				
					
						
							
							
								 
								Anatoly Bubenkov
							
						 
						
							 
							
							
							
							
								
							
							
								6af7172204 
								
							 
						 
						
							
							
								
								Merge branch 'pytest-2.7'  
							
							 
							
							
							
						 
						
							2015-07-19 15:25:04 +02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								2f7d0f8bd9 
								
							 
						 
						
							
							
								
								Consider --color option in more places which deal with TerminalWriters  
							
							 
							
							
							
						 
						
							2015-07-18 16:39:55 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								a7b4ed89da 
								
							 
						 
						
							
							
								
								Use functools.partial name explicitly and simplify the code a bit as asked in review  
							
							 
							
							
							
						 
						
							2015-07-16 20:37:04 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								dcdc823dd2 
								
							 
						 
						
							
							
								
								Support for tests created with functools.partial  
							
							 
							
							... 
							
							
							
							Fix  #811  
							
						 
						
							2015-07-16 20:37:03 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								5ec2a17f08 
								
							 
						 
						
							
							
								
								--fixtures only shows fixtures from first file  
							
							 
							
							... 
							
							
							
							Fix  #833  
							
						 
						
							2015-07-12 17:32:39 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								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  
						
					 
				
					
						
							
							
								 
								holger krekel
							
						 
						
							 
							
							
							
							
								
							
							
								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  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								eb73db56c7 
								
							 
						 
						
							
							
								
								Fix issue where pytest.raises() doesn't always return Exception instance in py26  
							
							 
							
							... 
							
							
							
							Fixes  #767  
							
						 
						
							2015-06-19 07:46:47 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								b40f760cc3 
								
							 
						 
						
							
							
								
								Change links from bitbucket to GitHub  
							
							 
							
							
							
						 
						
							2015-06-15 18:28:31 -03:00  
						
					 
				
					
						
							
							
								 
								holger krekel
							
						 
						
							 
							
							
							
							
								
							
							
								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  
						
					 
				
					
						
							
							
								 
								holger krekel
							
						 
						
							 
							
							
							
							
								
							
							
								5ee7ee0850 
								
							 
						 
						
							
							
								
								adapt pytest to using pluggy (current master)  
							
							 
							
							... 
							
							
							
							--HG--
branch : pluggy1 
							
						 
						
							2015-04-29 16:40:51 +02:00  
						
					 
				
					
						
							
							
								 
								holger krekel
							
						 
						
							 
							
							
							
							
								
							
							
								4e116ed503 
								
							 
						 
						
							
							
								
								make pytest_plugin_registered a historic hook  
							
							 
							
							... 
							
							
							
							--HG--
branch : more_plugin 
							
						 
						
							2015-04-25 13:38:30 +02:00  
						
					 
				
					
						
							
							
								 
								holger krekel
							
						 
						
							 
							
							
							
							
								
							
							
								2f8a1aed6e 
								
							 
						 
						
							
							
								
								properly perform hook calls with extra methods  
							
							 
							
							... 
							
							
							
							--HG--
branch : more_plugin 
							
						 
						
							2015-04-25 11:29:11 +02:00  
						
					 
				
					
						
							
							
								 
								holger krekel
							
						 
						
							 
							
							
							
							
								
							
							
								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  
						
					 
				
					
						
							
							
								 
								Floris Bruynooghe
							
						 
						
							 
							
							
							
							
								
							
							
								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  
						
					 
				
					
						
							
							
								 
								holger krekel
							
						 
						
							 
							
							
							
							
								
							
							
								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  
						
					 
				
					
						
							
							
								 
								holger krekel
							
						 
						
							 
							
							
							
							
								
							
							
								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  
						
					 
				
					
						
							
							
								 
								holger krekel
							
						 
						
							 
							
							
							
							
								
							
							
								173bd13ece 
								
							 
						 
						
							
							
								
								backport Y->y fix from floris  
							
							 
							
							... 
							
							
							
							--HG--
branch : pytest-2.7 
							
						 
						
							2015-04-17 11:57:09 +02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								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  
						
					 
				
					
						
							
							
								 
								Floris Bruynooghe
							
						 
						
							 
							
							
							
							
								
							
							
								c7a60af666 
								
							 
						 
						
							
							
								
								Use capital Y as the tests look for that  
							
							 
							
							
							
						 
						
							2015-04-13 09:08:10 +01:00  
						
					 
				
					
						
							
							
								 
								holger krekel
							
						 
						
							 
							
							
							
							
								
							
							
								3ed3e51997 
								
							 
						 
						
							
							
								
								fix issue660: properly report fixture scope mismatches independent  
							
							 
							
							... 
							
							
							
							from fixture argument ordering.
--HG--
branch : issue660 
							
						 
						
							2015-04-01 18:42:48 +02:00  
						
					 
				
					
						
							
							
								 
								Anatoly Bubenkov
							
						 
						
							 
							
							
							
							
								
							
							
								ce95437dee 
								
							 
						 
						
							
							
								
								merge with default  
							
							 
							
							... 
							
							
							
							--HG--
branch : issue463 
							
						 
						
							2015-03-23 20:41:27 +01:00  
						
					 
				
					
						
							
							
								 
								Brianna Laugher
							
						 
						
							 
							
							
							
							
								
							
							
								43e4fcf6dd 
								
							 
						 
						
							
							
								
								Raise specific MarkerError rather than generic ValueError  
							
							 
							
							... 
							
							
							
							--HG--
branch : issue463 
							
						 
						
							2015-03-23 20:01:58 +01:00  
						
					 
				
					
						
							
							
								 
								tigeraniya
							
						 
						
							 
							
							
							
							
								
							
							
								65ca554230 
								
							 
						 
						
							
							
								
								duplicate assignment  
							
							 
							
							
							
						 
						
							2015-03-23 20:47:34 +05:30  
						
					 
				
					
						
							
							
								 
								Brianna Laugher
							
						 
						
							 
							
							
							
							
								
							
							
								deb163d237 
								
							 
						 
						
							
							
								
								Change string format syntax from {} to {0} for py2.6  
							
							 
							
							... 
							
							
							
							--HG--
branch : issue463 
							
						 
						
							2015-03-21 23:57:06 +01:00  
						
					 
				
					
						
							
							
								 
								Brianna Laugher
							
						 
						
							 
							
							
							
							
								
							
							
								6f81602ba2 
								
							 
						 
						
							
							
								
								Use hasattr instead of try/except  
							
							 
							
							... 
							
							
							
							--HG--
branch : issue463 
							
						 
						
							2015-03-21 23:30:13 +01:00  
						
					 
				
					
						
							
							
								 
								Brianna Laugher
							
						 
						
							 
							
							
							
							
								
							
							
								ac17f20d98 
								
							 
						 
						
							
							
								
								#463  
							
							 
							
							... 
							
							
							
							Raise a ValueError early if user misspells 'parametrize' as 'parameterize'.
--HG--
branch : issue463 
							
						 
						
							2015-03-21 23:06:25 +01:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								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  
						
					 
				
					
						
							
							
								 
								Daniel Hahler
							
						 
						
							 
							
							
							
							
								
							
							
								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  
						
					 
				
					
						
							
							
								 
								Anatoly Bubenkov
							
						 
						
							 
							
							
							
							
								
							
							
								33c2a3a3e5 
								
							 
						 
						
							
							
								
								make loop more readable  
							
							 
							
							... 
							
							
							
							--HG--
branch : parametrized-fixture-override 
							
						 
						
							2015-03-02 08:55:57 +01:00  
						
					 
				
					
						
							
							
								 
								Anatoly Bubenkov
							
						 
						
							 
							
							
							
							
								
							
							
								c4623939af 
								
							 
						 
						
							
							
								
								support override of the parametrized fixture on the test level  
							
							 
							
							... 
							
							
							
							--HG--
branch : parametrized-fixture-override 
							
						 
						
							2015-03-01 15:15:37 +01:00  
						
					 
				
					
						
							
							
								 
								Anatoly Bubenkov
							
						 
						
							 
							
							
							
							
								
							
							
								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  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								1e6e373913 
								
							 
						 
						
							
							
								
								Merged in issue616 (pull request  #252 )  
							
							 
							
							... 
							
							
							
							fix issue616 - conftest visibility fixes. 
							
						 
						
							2015-02-28 10:02:58 +01:00  
						
					 
				
					
						
							
							
								 
								holger krekel
							
						 
						
							 
							
							
							
							
								
							
							
								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  
						
					 
				
					
						
							
							
								 
								holger krekel
							
						 
						
							 
							
							
							
							
								
							
							
								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  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								5941b2e071 
								
							 
						 
						
							
							
								
								fix issue 655: crude workarounds around python2/3 exception leaks  
							
							 
							
							
							
						 
						
							2015-01-09 19:55:49 +01:00  
						
					 
				
					
						
							
							
								 
								holger krekel
							
						 
						
							 
							
							
							
							
								
							
							
								959395b796 
								
							 
						 
						
							
							
								
								fix py26 compatibility  
							
							 
							
							
							
						 
						
							2014-10-27 10:02:15 +01:00  
						
					 
				
					
						
							
							
								 
								Floris Bruynooghe
							
						 
						
							 
							
							
							
							
								
							
							
								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  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								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  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								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  
						
					 
				
					
						
							
							
								 
								holger krekel
							
						 
						
							 
							
							
							
							
								
							
							
								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  
						
					 
				
					
						
							
							
								 
								holger krekel
							
						 
						
							 
							
							
							
							
								
							
							
								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