Jason R. Coombs
							
						 
						
							 
							
							
							
							
								
							
							
								f2c01c5407 
								
							 
						 
						
							
							
								
								Restore pexpect tests and bypass isalive/wait on macOS. Ref  #2022 .  
							
							 
							
							
							
						 
						
							2016-10-21 12:36:42 -04:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								37dcdfbc58 
								
							 
						 
						
							
							
								
								Re-enable docstring testing of _pytest modules on CI  
							
							 
							
							... 
							
							
							
							* Fix doctests
* List one env per line in tox.ini
* "doctesting" tox env now also tests docstrings using doctest 
							
						 
						
							2016-10-21 08:55:53 -02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								9d00615bbf 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into merge-master-into-features  
							
							 
							
							
							
						 
						
							2016-10-20 21:51:42 -02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								2a2b8cee09 
								
							 
						 
						
							
							
								
								Fix false-positive warnings from assertion rewrite hook  
							
							 
							
							... 
							
							
							
							Fix  #2005  
							
						 
						
							2016-10-20 21:40:57 -02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								620b384b69 
								
							 
						 
						
							
							
								
								Fix cmdline help message for custom options with two or more metavars  
							
							 
							
							... 
							
							
							
							Fix  #2004  
							
						 
						
							2016-10-20 20:34:39 -02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								78eec0d7f8 
								
							 
						 
						
							
							
								
								Handle import errors with non-ascii messages when importing plugins  
							
							 
							
							... 
							
							
							
							Fix  #1998  
							
						 
						
							2016-10-12 18:19:32 -03:00  
						
					 
				
					
						
							
							
								 
								Matthew Duck
							
						 
						
							 
							
							
							
							
								
							
							
								0061d9bd3d 
								
							 
						 
						
							
							
								
								Fix flake8 (unused import, trailng whitespace)  
							
							 
							
							
							
						 
						
							2016-10-11 00:17:15 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Duck
							
						 
						
							 
							
							
							
							
								
							
							
								b629da424e 
								
							 
						 
						
							
							
								
								Restructure truncation of assertion messages  
							
							 
							
							... 
							
							
							
							This addresses ref https://github.com/pytest-dev/pytest/issues/1954 .
The current truncation for assertion explanations does not deal with long lines
properly:
- Previously if lines were too long it would display a "-n more lines"
  message.
- 999e7c6541  introduced a bug where long lines can
  cause index errors if there are < 10 lines.
Extract the truncation logic into its own file and ensure it can deal with
long lines properly. 
							
						 
						
							2016-10-10 23:38:27 +01:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								cf13355d3f 
								
							 
						 
						
							
							
								
								Merge pull request  #1979  from nicoddemus/show-traceback-during-collection  
							
							 
							
							... 
							
							
							
							Show traceback during collection 
							
						 
						
							2016-10-05 16:18:43 -03:00  
						
					 
				
					
						
							
							
								 
								Tom V
							
						 
						
							 
							
							
							
							
								
							
							
								c93a9e3361 
								
							 
						 
						
							
							
								
								Fix   #1981 , improve ini-options help text  
							
							 
							
							
							
						 
						
							2016-10-04 14:41:09 +01:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								a1d446b8e8 
								
							 
						 
						
							
							
								
								Display traceback from Import errors using pytest's short representation  
							
							 
							
							... 
							
							
							
							Also omit pytest's own modules and internal libraries (py and pluggy) in low verbosity
Fix  #1976  
							
						 
						
							2016-10-03 21:46:44 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								7d66e4eae1 
								
							 
						 
						
							
							
								
								Display full traceback from Import errors when collecting test modules  
							
							 
							
							... 
							
							
							
							Fix  #1976  
							
						 
						
							2016-10-03 20:47:44 -03:00  
						
					 
				
					
						
							
							
								 
								Nikolaus Rath
							
						 
						
							 
							
							
							
							
								
							
							
								57bb3c6922 
								
							 
						 
						
							
							
								
								Improve error message when using pytest.skip at module level  
							
							 
							
							... 
							
							
							
							As discussed in issue #1959 . 
							
						 
						
							2016-10-01 13:38:52 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								4667b4decc 
								
							 
						 
						
							
							
								
								Merge branch 'master' into features  
							
							 
							
							
							
						 
						
							2016-09-29 19:03:26 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								a87b1c79c1 
								
							 
						 
						
							
							
								
								post 3.0.3 release changes  
							
							 
							
							
							
						 
						
							2016-09-29 18:58:17 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								dda17994ec 
								
							 
						 
						
							
							
								
								Prepare for 3.0.3 release  
							
							 
							
							
							
						 
						
							2016-09-28 16:33:38 -04:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								654af0ba25 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into features  
							
							 
							
							
							
						 
						
							2016-09-26 19:32:53 -03:00  
						
					 
				
					
						
							
							
								 
								Vlad Dragos
							
						 
						
							 
							
							
							
							
								
							
							
								3444796f3e 
								
							 
						 
						
							
							
								
								Fix formating error.  
							
							 
							
							
							
						 
						
							2016-09-26 13:59:28 +03:00  
						
					 
				
					
						
							
							
								 
								Vlad Dragos
							
						 
						
							 
							
							
							
							
								
							
							
								8985c0be3e 
								
							 
						 
						
							
							
								
								Change exception raised by DontReadFromInput.fileno() from ValueError to io.UnsupportedOperation  
							
							 
							
							
							
						 
						
							2016-09-26 13:15:35 +03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								835328d862 
								
							 
						 
						
							
							
								
								Vendor pluggy 0.4.0  
							
							 
							
							... 
							
							
							
							Fix  #1637  
							
						 
						
							2016-09-25 23:36:02 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								5e96edd435 
								
							 
						 
						
							
							
								
								Merge pull request  #1952  from davidszotten/pdbcls_without_pdb_on_fail  
							
							 
							
							... 
							
							
							
							Pdbcls without pdb on fail 
							
						 
						
							2016-09-25 20:24:45 -03:00  
						
					 
				
					
						
							
							
								 
								Roy Williams
							
						 
						
							 
							
							
							
							
								
							
							
								f1c4cfea2c 
								
							 
						 
						
							
							
								
								Remove implementation of `__getslice__`  
							
							 
							
							... 
							
							
							
							`__getslice__` has been Deprecated since Python 2.0 and is removed in Python 3.  See
https://docs.python.org/2/reference/datamodel.html#object.__getslice__ 
Unfortunately, Python 2 will still dispatch to `__getslice__` over `__getitem__`, See
http://bugs.python.org/issue2041 , which causes Warnings when running with `-3` in 2.7. 
							
						 
						
							2016-09-23 09:52:30 -07:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								e5deb8a927 
								
							 
						 
						
							
							
								
								Merge pull request  #1955  from rowillia/fix_python3_deprecation_warnings  
							
							 
							
							... 
							
							
							
							Fix `DeprecationWarnings` found when running py.test in Python 2.7 with the -3 flag. 
							
						 
						
							2016-09-22 17:37:52 -03:00  
						
					 
				
					
						
							
							
								 
								Roy Williams
							
						 
						
							 
							
							
							
							
								
							
							
								24db3c123d 
								
							 
						 
						
							
							
								
								Explicitly set  to None to have consistent behavior in Python 2 and Python 3  
							
							 
							
							
							
						 
						
							2016-09-22 09:22:12 -07:00  
						
					 
				
					
						
							
							
								 
								Roy Williams
							
						 
						
							 
							
							
							
							
								
							
							
								940ed7e943 
								
							 
						 
						
							
							
								
								Fix `DeprecationWarnings` found when running py.test in Python 2.7 with the -3 flag.  
							
							 
							
							... 
							
							
							
							Running through some of my tests with the `-3` flag in python2.7 I encountered some errors within py.test itself.  This fixes those errors so we can use py.test in order to identify problems with Python 3. 
							
						 
						
							2016-09-21 17:44:25 -07:00  
						
					 
				
					
						
							
							
								 
								Tyler Goodlet
							
						 
						
							 
							
							
							
							
								
							
							
								6db2f315fa 
								
							 
						 
						
							
							
								
								Explain a bad scope value to the user  
							
							 
							
							
							
						 
						
							2016-09-21 16:40:58 -04:00  
						
					 
				
					
						
							
							
								 
								David Szotten
							
						 
						
							 
							
							
							
							
								
							
							
								0ac85218d1 
								
							 
						 
						
							
							
								
								allow pdbcls without implying usepdb  
							
							 
							
							
							
						 
						
							2016-09-21 09:45:20 +00:00  
						
					 
				
					
						
							
							
								 
								Lev Maximov
							
						 
						
							 
							
							
							
							
								
							
							
								65be1231b1 
								
							 
						 
						
							
							
								
								AttributeError chaining bug  #1944  fix  
							
							 
							
							
							
						 
						
							2016-09-20 02:20:13 +07:00  
						
					 
				
					
						
							
							
								 
								Floris Bruynooghe
							
						 
						
							 
							
							
							
							
								
							
							
								887c097f8e 
								
							 
						 
						
							
							
								
								Merge pull request  #1951  from mattduck/feat/1512-dict-compare-output  
							
							 
							
							... 
							
							
							
							Feat/1512 dict compare output 
							
						 
						
							2016-09-19 17:34:09 +01:00  
						
					 
				
					
						
							
							
								 
								Floris Bruynooghe
							
						 
						
							 
							
							
							
							
								
							
							
								01db0f1cd1 
								
							 
						 
						
							
							
								
								Merge pull request  #1923  from RonnyPfannschmidt/mark-internal-value  
							
							 
							
							... 
							
							
							
							use consistent inner repressentation for marks 
							
						 
						
							2016-09-19 15:30:22 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Duck
							
						 
						
							 
							
							
							
							
								
							
							
								999e7c6541 
								
							 
						 
						
							
							
								
								Tidy formatting of assertion truncation  
							
							 
							
							... 
							
							
							
							Part two of https://github.com/pytest-dev/pytest/issues/1512 . Update the format
of the truncation message to help make it clear that pytest truncates the
entire assertion output when verbosity < 2. 
							
						 
						
							2016-09-19 15:27:38 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Duck
							
						 
						
							 
							
							
							
							
								
							
							
								dd64d823b9 
								
							 
						 
						
							
							
								
								Don't display dict common items if verbosity=1  
							
							 
							
							... 
							
							
							
							Part one of https://github.com/pytest-dev/pytest/issues/1512 .
If verbosity=1, assertion explanations are truncated at 10 lines. In this
situation, it's more important to tell the user which dictionary items are
different than which are the same. 
							
						 
						
							2016-09-19 15:27:28 +01:00  
						
					 
				
					
						
							
							
								 
								Floris Bruynooghe
							
						 
						
							 
							
							
							
							
								
							
							
								dc16fe2bb9 
								
							 
						 
						
							
							
								
								Merge junit-xml url attribute branch  
							
							 
							
							... 
							
							
							
							Merge branch 'url_attr' of https://github.com/fushi/pytest  into junitxml-url 
							
						 
						
							2016-09-19 12:57:05 +01:00  
						
					 
				
					
						
							
							
								 
								Floris Bruynooghe
							
						 
						
							 
							
							
							
							
								
							
							
								5b260d80f9 
								
							 
						 
						
							
							
								
								Merge pull request  #1883  from RonnyPfannschmidt/kill-memoized-call  
							
							 
							
							... 
							
							
							
							Kill memoized call 
							
						 
						
							2016-09-19 12:47:52 +01:00  
						
					 
				
					
						
							
							
								 
								Floris Bruynooghe
							
						 
						
							 
							
							
							
							
								
							
							
								f484e7c9ca 
								
							 
						 
						
							
							
								
								Merge pkg_resources workaround  
							
							 
							
							... 
							
							
							
							Merge branch 'pkg_resources_bugfix' of github.com:raquel-ucl/pytest into pkg-resources
This is an odd case and doesn't really make sense, it is working around a bug
in maven/jython and the old version or weird packaging of setuptools they use.
But we used to do this in the past so might as well keep doing this. 
							
						 
						
							2016-09-19 10:14:41 +01:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								04cf5e1df4 
								
							 
						 
						
							
							
								
								Fixed assertion rewriting for plugins in development mode  
							
							 
							
							... 
							
							
							
							Fix  #1934  
							
						 
						
							2016-09-14 21:59:33 -03:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								45524241a5 
								
							 
						 
						
							
							
								
								mark: fix introduced linting error  
							
							 
							
							
							
						 
						
							2016-09-08 10:16:45 +02:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								1812387bf0 
								
							 
						 
						
							
							
								
								Mark: fix python 3 compatibility  
							
							 
							
							
							
						 
						
							2016-09-08 10:03:45 +02:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								10094a3f09 
								
							 
						 
						
							
							
								
								use consistent inner repressentation for marks  
							
							 
							
							
							
						 
						
							2016-09-08 09:52:22 +02:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								1c9bd9278e 
								
							 
						 
						
							
							
								
								Merge pull request  #1913  from flub/builtin-assertion  
							
							 
							
							... 
							
							
							
							Remove BuiltinAssertionError 
							
						 
						
							2016-09-05 16:53:13 +02:00  
						
					 
				
					
						
							
							
								 
								Floris Bruynooghe
							
						 
						
							 
							
							
							
							
								
							
							
								28b1896e9a 
								
							 
						 
						
							
							
								
								Remove BuiltinAssertionError  
							
							 
							
							... 
							
							
							
							We used to have this when we where patching the real Python
AssertionError for use with reinterpret, but reinterpret is now
gone so we no longer need this as it is not used by rewrite. 
							
						 
						
							2016-09-05 15:29:09 +02:00  
						
					 
				
					
						
							
							
								 
								Florian Bruhin
							
						 
						
							 
							
							
							
							
								
							
							
								8a41b26f56 
								
							 
						 
						
							
							
								
								Merge pull request  #1908  from nicoddemus/parametrize-unicode-id  
							
							 
							
							... 
							
							
							
							The "ids" argument to "parametrize" again accepts unicode strings in Python 2 
							
						 
						
							2016-09-05 15:09:12 +02:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								e1674f60e7 
								
							 
						 
						
							
							
								
								remove memocollect anmd memoized_call  
							
							 
							
							
							
						 
						
							2016-09-05 14:41:28 +02:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								e572c16d3f 
								
							 
						 
						
							
							
								
								remove memoizedcall in Module  
							
							 
							
							
							
						 
						
							2016-09-05 14:41:28 +02:00  
						
					 
				
					
						
							
							
								 
								Huayi Zhang
							
						 
						
							 
							
							
							
							
								
							
							
								c60854474a 
								
							 
						 
						
							
							
								
								Fix keyword docs  
							
							 
							
							
							
						 
						
							2016-09-05 16:48:04 +08:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								1e10de574d 
								
							 
						 
						
							
							
								
								The "ids" argument to "parametrize" again accepts unicode strings in Python 2  
							
							 
							
							... 
							
							
							
							Fixes  #1905  
							
						 
						
							2016-09-02 18:38:15 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								f5d900d972 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into features  
							
							 
							
							
							
						 
						
							2016-09-01 23:07:49 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								ee284ec587 
								
							 
						 
						
							
							
								
								Set version to 3.0.3.dev0  
							
							 
							
							... 
							
							
							
							Also, using "dev0" as development suffix otherwise distutils gives a warning during "setup.py develop":
UserWarning: Normalizing '3.0.3.dev' to '3.0.3.dev0'
  normalized_version, 
							
						 
						
							2016-09-01 21:34:54 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								4e58c9a7d0 
								
							 
						 
						
							
							
								
								Fix use of deprecated getfuncargvalue method in the internal doctest plugin  
							
							 
							
							... 
							
							
							
							Fix  #1898  
							
						 
						
							2016-09-01 07:19:11 -04:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								4c45b93007 
								
							 
						 
						
							
							
								
								Changes for 3.0.2 release  
							
							 
							
							
							
						 
						
							2016-08-31 20:28:38 -04:00  
						
					 
				
					
						
							
							
								 
								mbyt
							
						 
						
							 
							
							
							
							
								
							
							
								696a9112be 
								
							 
						 
						
							
							
								
								integrating review commets of @nicoddemus  
							
							 
							
							... 
							
							
							
							plus small scale refactoring 
							
						 
						
							2016-08-31 22:33:47 +02:00  
						
					 
				
					
						
							
							
								 
								mbyt
							
						 
						
							 
							
							
							
							
								
							
							
								be08223d5a 
								
							 
						 
						
							
							
								
								Merge branch 'master' into disable_tearDown_and_cleanups_for_post_mortem_debugging  
							
							 
							
							... 
							
							
							
							Conflicts:
	CHANGELOG.rst 
							
						 
						
							2016-08-31 20:35:31 +02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								c8a366e551 
								
							 
						 
						
							
							
								
								Fix issue where pytest_plugins as string was marking wrong modules for rewrite  
							
							 
							
							... 
							
							
							
							Fix  #1888  
							
						 
						
							2016-08-30 22:53:50 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								9d2149d9c0 
								
							 
						 
						
							
							
								
								Merge pull request  #1884  from pytest-dev/master  
							
							 
							
							... 
							
							
							
							merge master into features 
							
						 
						
							2016-08-30 18:47:57 -03:00  
						
					 
				
					
						
							
							
								 
								mbyt
							
						 
						
							 
							
							
							
							
								
							
							
								4eeb475138 
								
							 
						 
						
							
							
								
								avoid tearDown and cleanup for unittest debugging  
							
							 
							
							
							
						 
						
							2016-08-30 21:55:49 +02:00  
						
					 
				
					
						
							
							
								 
								mbyt
							
						 
						
							 
							
							
							
							
								
							
							
								8593bb12ee 
								
							 
						 
						
							
							
								
								pdbcls ipython example with tab completion  
							
							 
							
							
							
						 
						
							2016-08-29 21:15:12 +02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								519f02b014 
								
							 
						 
						
							
							
								
								docs warnings as errors and initial page similar to README  
							
							 
							
							... 
							
							
							
							* Changed "index" to be more similar to the README (#1708 ).
* Fixes numerous issues like missing documents, syntax errors, etc (#1829 , #432 ).
* Mention all docs in "contents.rst" so it's easier for users to locate (#1112 ).
* Add doc generation and checking to Travis and AppVeyor, to avoid re-introducing errors.
Fixes  #432 , Fixes  #1112 , Fixes  #1708 , Fixes  #1829  
							
						 
						
							2016-08-26 17:47:18 -03:00  
						
					 
				
					
						
							
							
								 
								Ahn Ki-Wook
							
						 
						
							 
							
							
							
							
								
							
							
								856ad719d3 
								
							 
						 
						
							
							
								
								Fix UnicodeEncodeError when string comparison with unicode has failed.  
							
							 
							
							
							
						 
						
							2016-08-26 09:41:40 +09:00  
						
					 
				
					
						
							
							
								 
								John Towler
							
						 
						
							 
							
							
							
							
								
							
							
								1b259f70f3 
								
							 
						 
						
							
							
								
								Testcase reports with a url attribute will now properly write this to junitxml  
							
							 
							
							
							
						 
						
							2016-08-25 13:08:51 -07:00  
						
					 
				
					
						
							
							
								 
								Jordan Guymon
							
						 
						
							 
							
							
							
							
								
							
							
								a152ea2dbb 
								
							 
						 
						
							
							
								
								Add buffer attribute to stdin stub  
							
							 
							
							
							
						 
						
							2016-08-24 16:26:34 -07:00  
						
					 
				
					
						
							
							
								 
								Raquel Alegre
							
						 
						
							 
							
							
							
							
								
							
							
								8f516d27fa 
								
							 
						 
						
							
							
								
								Moved import pkg_resources to else clause.  
							
							 
							
							
							
						 
						
							2016-08-24 10:25:01 +01:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								972a5fb5d5 
								
							 
						 
						
							
							
								
								Improve error message when passing non-string ids to pytest.mark.parametrize  
							
							 
							
							... 
							
							
							
							Fix  #1857  
							
						 
						
							2016-08-23 23:31:45 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								7704f73db9 
								
							 
						 
						
							
							
								
								Merge branch 'master' into merge-master-into-features  
							
							 
							
							
							
						 
						
							2016-08-23 21:36:42 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								ea0febad28 
								
							 
						 
						
							
							
								
								Updates for new patch version 3.0.2  
							
							 
							
							
							
						 
						
							2016-08-23 21:33:57 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								49fc4e5e4c 
								
							 
						 
						
							
							
								
								Changes for 3.0.1 release  
							
							 
							
							
							
						 
						
							2016-08-23 18:15:43 -04:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								df200297e2 
								
							 
						 
						
							
							
								
								Fix internal error when parametrizing using and empty list of ids()  
							
							 
							
							... 
							
							
							
							Fix  #1849  
							
						 
						
							2016-08-23 18:18:46 -03:00  
						
					 
				
					
						
							
							
								 
								Raquel Alegre
							
						 
						
							 
							
							
							
							
								
							
							
								2f11a85698 
								
							 
						 
						
							
							
								
								Import pkg_resources only when necessary.  
							
							 
							
							
							
						 
						
							2016-08-23 16:41:11 +01:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								53a0e2b118 
								
							 
						 
						
							
							
								
								Fix code which guesses parametrized scope based on arguments  
							
							 
							
							... 
							
							
							
							Fix  #1832  
							
						 
						
							2016-08-22 21:05:41 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								d99ceb1218 
								
							 
						 
						
							
							
								
								Merge pull request  #1844  from nicoddemus/importer-error  
							
							 
							
							... 
							
							
							
							Importer loader error 
							
						 
						
							2016-08-22 20:47:25 -03:00  
						
					 
				
					
						
							
							
								 
								Marcin Bachry
							
						 
						
							 
							
							
							
							
								
							
							
								678750c8f8 
								
							 
						 
						
							
							
								
								Fix importer call  
							
							 
							
							
							
						 
						
							2016-08-21 22:07:18 +02:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								406777d104 
								
							 
						 
						
							
							
								
								mark plugin: move the unclean marked parameter extraction  
							
							 
							
							
							
						 
						
							2016-08-21 20:44:37 +02:00  
						
					 
				
					
						
							
							
								 
								Florian Bruhin
							
						 
						
							 
							
							
							
							
								
							
							
								a20c3f9c44 
								
							 
						 
						
							
							
								
								Merge pull request  #1827  from blueyed/Fix-spelling-s-outside-a-outside-of-a-  
							
							 
							
							... 
							
							
							
							Fix spelling: s/outside a/outside of a/ 
							
						 
						
							2016-08-20 20:04:58 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Hahler
							
						 
						
							 
							
							
							
							
								
							
							
								86ec3f37af 
								
							 
						 
						
							
							
								
								minor: s/no pkg_resources/pkg_resources/  
							
							 
							
							
							
						 
						
							2016-08-20 18:47:42 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Hahler
							
						 
						
							 
							
							
							
							
								
							
							
								e306a53999 
								
							 
						 
						
							
							
								
								Fix spelling: s/outside a/outside of a/  
							
							 
							
							
							
						 
						
							2016-08-20 18:43:39 +02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								63dc71c57e 
								
							 
						 
						
							
							
								
								Fix regression when using importorskip at module level  
							
							 
							
							... 
							
							
							
							Fix  #1822  
							
						 
						
							2016-08-19 18:21:25 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								db922403cc 
								
							 
						 
						
							
							
								
								Bump version to 3.1.0.dev  
							
							 
							
							
							
						 
						
							2016-08-19 17:44:07 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								3a200b75c9 
								
							 
						 
						
							
							
								
								Bump version to 3.0.1.dev  
							
							 
							
							
							
						 
						
							2016-08-19 17:41:45 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								a3e6c14da3 
								
							 
						 
						
							
							
								
								Bump version to 3.0.0  
							
							 
							
							
							
						 
						
							2016-08-18 11:41:10 -04:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								66673c0dd3 
								
							 
						 
						
							
							
								
								Remove obsolete docstring  
							
							 
							
							
							
						 
						
							2016-08-17 22:59:18 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								3ba475c0f2 
								
							 
						 
						
							
							
								
								Move internal _is_unittest_unexpected_success_a_failure to "compat" module  
							
							 
							
							... 
							
							
							
							Fix  #1815  
							
						 
						
							2016-08-17 22:50:10 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								463e6572c5 
								
							 
						 
						
							
							
								
								Merge branch 'master' into merge-master-into-features  
							
							 
							
							... 
							
							
							
							Preparing for 3.0 
							
						 
						
							2016-08-17 22:39:23 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								4ed412eb59 
								
							 
						 
						
							
							
								
								unittest's unexpectedSuccess should work as non-strict xpass  
							
							 
							
							... 
							
							
							
							Make sure tests for that behavior obtain the same return code
using either pytest or unittest to run the same file 
							
						 
						
							2016-08-17 21:32:04 -03:00  
						
					 
				
					
						
							
							
								 
								Raphael Pierzina
							
						 
						
							 
							
							
							
							
								
							
							
								bb3d6d87b6 
								
							 
						 
						
							
							
								
								Merge branch 'master' into fix-report-outcome-for-xpass  
							
							 
							
							
							
						 
						
							2016-08-17 22:15:29 +01:00  
						
					 
				
					
						
							
							
								 
								Florian Bruhin
							
						 
						
							 
							
							
							
							
								
							
							
								789e4670e7 
								
							 
						 
						
							
							
								
								Merge pull request  #1813  from nicoddemus/pytest-setup.cfg  
							
							 
							
							... 
							
							
							
							Support [tool:pytest] in setup.cfg files 
							
						 
						
							2016-08-17 20:33:57 +02:00  
						
					 
				
					
						
							
							
								 
								Florian Bruhin
							
						 
						
							 
							
							
							
							
								
							
							
								c8ab79402c 
								
							 
						 
						
							
							
								
								Merge pull request  #1811  from nicoddemus/revert-invocation-fixtures  
							
							 
							
							... 
							
							
							
							Revert invocation-fixtures code 
							
						 
						
							2016-08-17 20:32:54 +02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								ab86dea529 
								
							 
						 
						
							
							
								
								Support [tool:pytest] in setup.cfg files  
							
							 
							
							... 
							
							
							
							Also deprecate [pytest] usage in setup.cfg files
Fix  #567  
							
						 
						
							2016-08-17 08:19:38 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								707b6b5e3f 
								
							 
						 
						
							
							
								
								Revert all invocation-fixtures code  
							
							 
							
							... 
							
							
							
							Due to a serious regression found in #1794 , it was decided to pull off
invocation features from 3.0 so it can be (hopefully) re-introduced
in 3.1 
							
						 
						
							2016-08-17 08:12:55 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								f25771a101 
								
							 
						 
						
							
							
								
								Deprecate --resultlog cmdline option  
							
							 
							
							... 
							
							
							
							Fix  #830  
							
						 
						
							2016-08-16 21:40:34 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								ca5957932b 
								
							 
						 
						
							
							
								
								Merge pull request  #1806  from blueyed/fix-off-by-one-error-with-warnings  
							
							 
							
							... 
							
							
							
							Fix off-by-one error with lines from request.node.warn 
							
						 
						
							2016-08-15 19:04:00 -03:00  
						
					 
				
					
						
							
							
								 
								Daniel Hahler
							
						 
						
							 
							
							
							
							
								
							
							
								c163cc7937 
								
							 
						 
						
							
							
								
								Improve display of continuation lines with multiline errors  
							
							 
							
							... 
							
							
							
							Fixes https://github.com/pytest-dev/pytest/issues/717 .
Follow-up to https://github.com/pytest-dev/pytest/pull/1762 . 
							
						 
						
							2016-08-14 22:34:31 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Hahler
							
						 
						
							 
							
							
							
							
								
							
							
								16cb5d01b1 
								
							 
						 
						
							
							
								
								Fix off-by-one error with lines from request.node.warn  
							
							 
							
							... 
							
							
							
							The line numbers in `node.location` seem to be zero-based?! 
							
						 
						
							2016-08-14 22:10:01 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Hahler
							
						 
						
							 
							
							
							
							
								
							
							
								5b95ee3c19 
								
							 
						 
						
							
							
								
								Pass exitstatus to pytest_terminal_summary hook  
							
							 
							
							... 
							
							
							
							This is useful to know if a testrun has been interrupted
(EXIT_INTERRUPTED). 
							
						 
						
							2016-08-14 22:06:35 +02:00  
						
					 
				
					
						
							
							
								 
								Raphael Pierzina
							
						 
						
							 
							
							
							
							
								
							
							
								225341cf2c 
								
							 
						 
						
							
							
								
								Set wasxfail only for xpass w/o strict and else set longrepr  
							
							 
							
							
							
						 
						
							2016-08-13 00:00:51 +01:00  
						
					 
				
					
						
							
							
								 
								Raphael Pierzina
							
						 
						
							 
							
							
							
							
								
							
							
								296f42a2c9 
								
							 
						 
						
							
							
								
								Treat unittest.expectedFailure pass as a failure  
							
							 
							
							
							
						 
						
							2016-08-12 23:18:36 +01:00  
						
					 
				
					
						
							
							
								 
								Christian Boelsen
							
						 
						
							 
							
							
							
							
								
							
							
								e4028b4505 
								
							 
						 
						
							
							
								
								Fix   #1798  to include errors in total tests in junit xml output.  
							
							 
							
							
							
						 
						
							2016-08-08 13:35:49 +01:00  
						
					 
				
					
						
							
							
								 
								Floris Bruynooghe
							
						 
						
							 
							
							
							
							
								
							
							
								99a4a1a784 
								
							 
						 
						
							
							
								
								Merge pull request  #1791  from nicoddemus/ide-integration-1790  
							
							 
							
							... 
							
							
							
							Internal adjustments for easier integration with IDEs 
							
						 
						
							2016-08-07 23:50:50 +01:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								802755ceed 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into merge-master-into-features  
							
							 
							
							
							
						 
						
							2016-08-06 17:58:17 -03:00  
						
					 
				
					
						
							
							
								 
								Daniel Hahler
							
						 
						
							 
							
							
							
							
								
							
							
								a2891420de 
								
							 
						 
						
							
							
								
								Fix determining rootdir from common_ancestor  
							
							 
							
							
							
						 
						
							2016-08-06 19:35:40 +02:00  
						
					 
				
					
						
							
							
								 
								Raphael Pierzina
							
						 
						
							 
							
							
							
							
								
							
							
								4fc20d09fe 
								
							 
						 
						
							
							
								
								Change outcome to 'passed' for xfail unless it's strict  
							
							 
							
							
							
						 
						
							2016-08-05 19:25:55 +01:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								1a79137d04 
								
							 
						 
						
							
							
								
								Add originalname attribute to Function  
							
							 
							
							... 
							
							
							
							Related to #1790  
							
						 
						
							2016-08-03 22:56:12 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								530b0050b4 
								
							 
						 
						
							
							
								
								Improve TestReport.sections docs a bit  
							
							 
							
							... 
							
							
							
							Related to #1790  
							
						 
						
							2016-08-03 21:57:58 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								ff296fd541 
								
							 
						 
						
							
							
								
								Add capstdout and capstderr attrs to TestReport  
							
							 
							
							... 
							
							
							
							Related to #1790  
							
						 
						
							2016-08-03 21:49:43 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								08002ab75a 
								
							 
						 
						
							
							
								
								Add longreprtext property to TestReport objects  
							
							 
							
							... 
							
							
							
							Related to #1790  
							
						 
						
							2016-08-03 21:49:28 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								6711b1d6ab 
								
							 
						 
						
							
							
								
								Rewrite asserts in test-modules loaded very early in the startup  
							
							 
							
							... 
							
							
							
							Also now match modules which start with any of the names registered
using register_assert_rewrite as discussed in #1787 
Fix  #1784  
							
						 
						
							2016-08-03 12:49:48 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								277b6d3974 
								
							 
						 
						
							
							
								
								Sort fixture names when a fixture lookup error occurs  
							
							 
							
							
							
						 
						
							2016-08-02 19:45:31 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								ea6191a0cd 
								
							 
						 
						
							
							
								
								Merge pull request  #1779  from RonnyPfannschmidt/deselect-no-reason  
							
							 
							
							... 
							
							
							
							terminal: dont pretend to know the deselection reason 
							
						 
						
							2016-08-02 08:38:17 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								553dc2600f 
								
							 
						 
						
							
							
								
								Strip invocation-scope suffix when displaying fixture lookup error  
							
							 
							
							
							
						 
						
							2016-08-01 20:34:56 -03:00  
						
					 
				
					
						
							
							
								 
								Raphael Pierzina
							
						 
						
							 
							
							
							
							
								
							
							
								226f2795ba 
								
							 
						 
						
							
							
								
								Merge pull request  #1782  from nicoddemus/invocation-fixtures-help  
							
							 
							
							... 
							
							
							
							invocation-scoped fixtures show up once with --fixtures 
							
						 
						
							2016-08-01 23:21:28 +01:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								44ecf2ab2f 
								
							 
						 
						
							
							
								
								invocation-scoped fixtures show up once with --fixtures  
							
							 
							
							
							
						 
						
							2016-08-01 18:48:29 -03:00  
						
					 
				
					
						
							
							
								 
								satoru
							
						 
						
							 
							
							
							
							
								
							
							
								3c8222f1db 
								
							 
						 
						
							
							
								
								Highlight the path of file location in error report  
							
							 
							
							... 
							
							
							
							So that it's more obvious when we need to copy the file path. 
							
						 
						
							2016-08-01 17:42:20 -03:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								ac215e9cff 
								
							 
						 
						
							
							
								
								terminal: dont pretend to know the deselection reason  
							
							 
							
							... 
							
							
							
							this addresses #1372  - we pretend we know the deselection reason from internal plugins and ignore 3rd party/local reasons 
							
						 
						
							2016-08-01 13:50:59 +02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								aa145fa83e 
								
							 
						 
						
							
							
								
								Add 'invocation' scope option to fixture docstring  
							
							 
							
							
							
						 
						
							2016-07-29 12:47:30 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								76fbc6379f 
								
							 
						 
						
							
							
								
								Fix deprecated directive in docstring  
							
							 
							
							
							
						 
						
							2016-07-29 12:39:48 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								eaf8d9ce19 
								
							 
						 
						
							
							
								
								Set version to 3.0.0.dev1  
							
							 
							
							... 
							
							
							
							For a long time now we've considering the next version to be 3.0.0 
							
						 
						
							2016-07-28 21:30:16 -03:00  
						
					 
				
					
						
							
							
								 
								Floris Bruynooghe
							
						 
						
							 
							
							
							
							
								
							
							
								510a6083ba 
								
							 
						 
						
							
							
								
								Merge pull request  #1758  from nicoddemus/deprecated-module  
							
							 
							
							... 
							
							
							
							Add deprecation module to centralize deprecation messages and bits of… 
							
						 
						
							2016-07-28 22:36:55 +01:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								ed36d627e4 
								
							 
						 
						
							
							
								
								Use PyInstaller for freeze test env  
							
							 
							
							... 
							
							
							
							cx_freeze doesn't seem to be very well supported in Python 3.5.
Using pyinstaller instead and rename environment to "freeze" which
is a more generic term for freezing python code into standalone
executables.
Fix  #1769  
							
						 
						
							2016-07-26 22:02:37 -03:00  
						
					 
				
					
						
							
							
								 
								Roberto Polli
							
						 
						
							 
							
							
							
							
								
							
							
								05728d1317 
								
							 
						 
						
							
							
								
								fix keep-duplicates help line.  
							
							 
							
							
							
						 
						
							2016-07-26 09:53:12 +02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								c2864aba3d 
								
							 
						 
						
							
							
								
								Merge branch 'master' into merge-master  
							
							 
							
							... 
							
							
							
							# Conflicts:
#	AUTHORS
#	CHANGELOG.rst
#	_pytest/monkeypatch.py
#	_pytest/python.py 
							
						 
						
							2016-07-25 19:06:29 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								9cf09cda7b 
								
							 
						 
						
							
							
								
								Remove some comments and improved changelog  
							
							 
							
							
							
						 
						
							2016-07-25 18:41:03 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								d911bfcb8a 
								
							 
						 
						
							
							
								
								Merge branch 'issue634-scopes' of  https://github.com/Stranger6667/pytest  
							
							 
							
							... 
							
							
							
							# Conflicts:
#	CHANGELOG.rst 
							
						 
						
							2016-07-25 18:26:50 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								8f29ce26e9 
								
							 
						 
						
							
							
								
								Merge branch 'mark_missing_fixture_error' of  https://github.com/eolo999/pytest  
							
							 
							
							
							
						 
						
							2016-07-25 18:20:17 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								6c8b0a28e1 
								
							 
						 
						
							
							
								
								Add deprecation module to centralize deprecation messages and bits of code  
							
							 
							
							
							
						 
						
							2016-07-25 18:14:39 -03:00  
						
					 
				
					
						
							
							
								 
								Dmitry Dygalo
							
						 
						
							 
							
							
							
							
								
							
							
								d72afe7e08 
								
							 
						 
						
							
							
								
								Fixed scope override inside metafunc.parametrize.  Fixes   #634  
							
							 
							
							
							
						 
						
							2016-07-25 12:42:50 +02:00  
						
					 
				
					
						
							
							
								 
								Roberto Polli
							
						 
						
							 
							
							
							
							
								
							
							
								ab6aef1d1f 
								
							 
						 
						
							
							
								
								feature: default behavior now is to ignore duplicate paths specified from the command line. Use --keep-duplicates to retain duplicate paths.  
							
							 
							
							
							
						 
						
							2016-07-25 12:41:58 +02:00  
						
					 
				
					
						
							
							
								 
								Dmitry Dygalo
							
						 
						
							 
							
							
							
							
								
							
							
								f7ad173fee 
								
							 
						 
						
							
							
								
								Fixed collection of classes with custom ``__new__`` method  
							
							 
							
							
							
						 
						
							2016-07-25 11:33:37 +02:00  
						
					 
				
					
						
							
							
								 
								Florian Bruhin
							
						 
						
							 
							
							
							
							
								
							
							
								a309a571d9 
								
							 
						 
						
							
							
								
								Cleanups for  #1763  
							
							 
							
							
							
						 
						
							2016-07-25 10:17:46 +02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								a24146dd3c 
								
							 
						 
						
							
							
								
								Merge pull request  #1757  from tramwaj29/improved-message-when-not-using-parametrized-variable  
							
							 
							
							... 
							
							
							
							Improved message when not using parametrized variable 
							
						 
						
							2016-07-24 13:02:03 -03:00  
						
					 
				
					
						
							
							
								 
								Tom Viner
							
						 
						
							 
							
							
							
							
								
							
							
								42adaf5a61 
								
							 
						 
						
							
							
								
								Fix   #1210  display msg for early calls to exit  
							
							 
							
							
							
						 
						
							2016-07-24 14:16:34 +02:00  
						
					 
				
					
						
							
							
								 
								JJ
							
						 
						
							 
							
							
							
							
								
							
							
								4aede6faa6 
								
							 
						 
						
							
							
								
								fixed conflicts  
							
							 
							
							
							
						 
						
							2016-07-24 12:10:32 +02:00  
						
					 
				
					
						
							
							
								 
								JJ
							
						 
						
							 
							
							
							
							
								
							
							
								d000f2536a 
								
							 
						 
						
							
							
								
								added a test for when the indirect is just a string  
							
							 
							
							
							
						 
						
							2016-07-24 10:47:06 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Hahler
							
						 
						
							 
							
							
							
							
								
							
							
								5c5d7e05f7 
								
							 
						 
						
							
							
								
								Followup to  #1718 : style/formatting  
							
							 
							
							
							
						 
						
							2016-07-24 00:21:42 +02:00  
						
					 
				
					
						
							
							
								 
								Edoardo Batini
							
						 
						
							 
							
							
							
							
								
							
							
								6799a47c78 
								
							 
						 
						
							
							
								
								Start FixtureLookupErrorRepr with an 'E'  
							
							 
							
							
							
						 
						
							2016-07-23 23:43:34 +02:00  
						
					 
				
					
						
							
							
								 
								JJ
							
						 
						
							 
							
							
							
							
								
							
							
								f26fa5a441 
								
							 
						 
						
							
							
								
								changed error message for unused parametrize name  
							
							 
							
							
							
						 
						
							2016-07-23 16:49:20 +02:00  
						
					 
				
					
						
							
							
								 
								Romain Dorgueil
							
						 
						
							 
							
							
							
							
								
							
							
								94731fc2a1 
								
							 
						 
						
							
							
								
								Changes variable name so it better describes what it does now.  
							
							 
							
							
							
						 
						
							2016-07-23 16:26:33 +02:00  
						
					 
				
					
						
							
							
								 
								Romain Dorgueil
							
						 
						
							 
							
							
							
							
								
							
							
								51fa244650 
								
							 
						 
						
							
							
								
								Cleaner implementation of  #1749 .  
							
							 
							
							
							
						 
						
							2016-07-23 16:18:12 +02:00  
						
					 
				
					
						
							
							
								 
								Romain Dorgueil
							
						 
						
							 
							
							
							
							
								
							
							
								ec7695e15d 
								
							 
						 
						
							
							
								
								adds a bit of doctest hint on why the key and value getters are separate functions.  
							
							 
							
							
							
						 
						
							2016-07-23 15:19:18 +02:00  
						
					 
				
					
						
							
							
								 
								Romain Dorgueil
							
						 
						
							 
							
							
							
							
								
							
							
								87ca4b95fb 
								
							 
						 
						
							
							
								
								Separate the option keys and value to avoid importing "doctest" (and tested things like "logging") for argument parsing ( fixes   #1749 )  
							
							 
							
							
							
						 
						
							2016-07-23 14:50:24 +02:00  
						
					 
				
					
						
							
							
								 
								Romain Dorgueil
							
						 
						
							 
							
							
							
							
								
							
							
								fd8e019cc1 
								
							 
						 
						
							
							
								
								Choose the doctest output format in case of failure, still work in progress as a few checks fail (related to  #1749 )  
							
							 
							
							
							
						 
						
							2016-07-23 14:40:46 +02:00  
						
					 
				
					
						
							
							
								 
								Romain Dorgueil
							
						 
						
							 
							
							
							
							
								
							
							
								625b603f1f 
								
							 
						 
						
							
							
								
								Implements an option to choose the doctest output format in case of failure. ( fixes   #1749 )  
							
							 
							
							
							
						 
						
							2016-07-23 13:06:05 +02:00  
						
					 
				
					
						
							
							
								 
								Javi Romero
							
						 
						
							 
							
							
							
							
								
							
							
								7e37497d5a 
								
							 
						 
						
							
							
								
								Uppercase first word in docstrings. Change to an imperative form. Add name to authors.  
							
							 
							
							
							
						 
						
							2016-07-22 12:39:06 +02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								ae0798522f 
								
							 
						 
						
							
							
								
								Merge pull request  #1711  from nicoddemus/invocation-scoped-fixtures  
							
							 
							
							... 
							
							
							
							Invocation scoped fixtures 
							
						 
						
							2016-07-21 19:48:52 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								4c112401c5 
								
							 
						 
						
							
							
								
								Log LineMatcher output in a stream instead of stderr  
							
							 
							
							... 
							
							
							
							This makes the match/nomatch output appear as part
of the fnmatch_lines() error on pytest's output instead
of globbered together with general stdout/stderr capture 
							
						 
						
							2016-07-20 22:35:43 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								05f3422d7c 
								
							 
						 
						
							
							
								
								Make monkeypatch invocation-scoped  
							
							 
							
							
							
						 
						
							2016-07-20 22:05:49 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								4f2bf965cb 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/features' into invocation-scoped-fixtures  
							
							 
							
							
							
						 
						
							2016-07-20 21:16:27 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								20f97c3041 
								
							 
						 
						
							
							
								
								Small documentation improvements  
							
							 
							
							
							
						 
						
							2016-07-20 20:22:28 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								e0f08a73ab 
								
							 
						 
						
							
							
								
								Merge branch 'features' into conftest-exception-printing  
							
							 
							
							
							
						 
						
							2016-07-20 19:33:36 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								93aae987a2 
								
							 
						 
						
							
							
								
								Merge pull request  #1744  from RonnyPfannschmidt/existfirst-override  
							
							 
							
							... 
							
							
							
							allow --exitfirst/-x to be overridden by a following --maxfail 
							
						 
						
							2016-07-20 18:16:07 -03:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								9dadaa8a41 
								
							 
						 
						
							
							
								
								skipping plugin: remove python2.5 compat code  
							
							 
							
							
							
						 
						
							2016-07-20 17:45:20 +02:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								2a05c311e9 
								
							 
						 
						
							
							
								
								implement exitfirst as store_const option  
							
							 
							
							... 
							
							
							
							this makes it possible to override with a later maxfail 
							
						 
						
							2016-07-20 17:15:29 +02:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								61cc5c4d4e 
								
							 
						 
						
							
							
								
								argument parsing: always warn for string types  
							
							 
							
							... 
							
							
							
							fix  #1741  
							
						 
						
							2016-07-19 10:33:25 +02:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								317b3f257d 
								
							 
						 
						
							
							
								
								optparse compatibility - add float and complex  
							
							 
							
							... 
							
							
							
							also documents the implementation quality
fixes  #457  
							
						 
						
							2016-07-19 10:20:41 +02:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								8a73a2ad60 
								
							 
						 
						
							
							
								
								Merge pull request  #1734  from nicoddemus/issue-1728-inconsistent-setup-teardown  
							
							 
							
							... 
							
							
							
							setup_* and teardown_* functions argument now optional 
							
						 
						
							2016-07-15 14:59:22 +02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								ff8fb4950e 
								
							 
						 
						
							
							
								
								setup_* and teardown_* functions argument now optional  
							
							 
							
							... 
							
							
							
							setup_module, setup_function and setup_method
extra argument are now optional and may be omitted.
Fix  #1728  
							
						 
						
							2016-07-14 23:41:40 -03:00  
						
					 
				
					
						
							
							
								 
								Floris Bruynooghe
							
						 
						
							 
							
							
							
							
								
							
							
								d1852a48b7 
								
							 
						 
						
							
							
								
								Remove assertion reinterpretation  
							
							 
							
							... 
							
							
							
							The assertion reinterpretation is an old backwards compatibility
mode which was no longer being maintained on feature-parity with
the assertion rewriting mode.  It was also responsible for some
dubious patching of builtins and test with side-effects would
suddenly start passing.  Since re-writing has been the default for
a long time and plugins are now also re-written it is time to
retire reinterpretation. 
							
						 
						
							2016-07-15 00:33:39 +01:00  
						
					 
				
					
						
							
							
								 
								Floris Bruynooghe
							
						 
						
							 
							
							
							
							
								
							
							
								24fbbbef1f 
								
							 
						 
						
							
							
								
								Merge pull request  #1641  from flub/rewrite-plugins  
							
							 
							
							... 
							
							
							
							Rewrite plugins 
							
						 
						
							2016-07-14 19:39:15 +01:00  
						
					 
				
					
						
							
							
								 
								Floris Bruynooghe
							
						 
						
							 
							
							
							
							
								
							
							
								51ee7f8734 
								
							 
						 
						
							
							
								
								Fixup things after rebase  
							
							 
							
							... 
							
							
							
							Some changes to make things work on top of current features branch. 
							
						 
						
							2016-07-14 12:42:29 +01:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								ab0b6faa5f 
								
							 
						 
						
							
							
								
								Deprecate support for passing command-line as string to pytest.main()  
							
							 
							
							... 
							
							
							
							Fixes  #1723  
							
						 
						
							2016-07-14 08:11:43 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								1266ebec83 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/features' into warnings-displayed-by-default  
							
							 
							
							... 
							
							
							
							# Conflicts:
#	CHANGELOG.rst
#	testing/test_terminal.py 
							
						 
						
							2016-07-13 18:45:15 -03:00  
						
					 
				
					
						
							
							
								 
								Daniel Hahler
							
						 
						
							 
							
							
							
							
								
							
							
								3cfebdd7c5 
								
							 
						 
						
							
							
								
								funcarg_prefix_warning: remove newline  
							
							 
							
							... 
							
							
							
							Followup to https://github.com/pytest-dev/pytest/pull/1718 . 
							
						 
						
							2016-07-13 18:33:24 +02:00  
						
					 
				
					
						
							
							
								 
								Floris Bruynooghe
							
						 
						
							 
							
							
							
							
								
							
							
								743f59afb2 
								
							 
						 
						
							
							
								
								Introduce pytest.register_assert_rewrite()  
							
							 
							
							... 
							
							
							
							Plugins can now explicitly mark modules to be re-written.  By default
only the modules containing the plugin entrypoint are re-written. 
							
						 
						
							2016-07-13 17:31:09 +01:00  
						
					 
				
					
						
							
							
								 
								Floris Bruynooghe
							
						 
						
							 
							
							
							
							
								
							
							
								944da5b98a 
								
							 
						 
						
							
							
								
								Avoid rewrite warning for inline runs  
							
							 
							
							... 
							
							
							
							When running pytest inline/inprocess we plugins have already been
imported and re-writen, so avoid the warning. 
							
						 
						
							2016-07-13 17:29:19 +01:00  
						
					 
				
					
						
							
							
								 
								Floris Bruynooghe
							
						 
						
							 
							
							
							
							
								
							
							
								a98e3cefc5 
								
							 
						 
						
							
							
								
								Enable re-writing of setuptools-installed plugins  
							
							 
							
							... 
							
							
							
							Hook up the PEP 302 import hook very early in pytest startup so
that it gets installed before setuptools-installed plugins are
imported.  Also iterate over all installed plugins and mark them
for rewriting.  If an installed plugin is already imported then
a warning is issued, we can not break since that might break
existing plugins and the fallback will still be gracefull to
plain asserts.
Some existing tests are failing in this commit because of the new
warning triggered by inline pytest runs due to the hypothesis
plugin already being imported.  The tests will be fixed in the next
commit. 
							
						 
						
							2016-07-13 17:29:19 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Hahler
							
						 
						
							 
							
							
							
							
								
							
							
								15e97a7c78 
								
							 
						 
						
							
							
								
								Add punctuation to funcarg_prefix_warning  
							
							 
							
							
							
						 
						
							2016-07-12 23:49:09 +02:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								c4f20a1834 
								
							 
						 
						
							
							
								
								Merge pull request  #1712  from anntzer/custom-debugger  
							
							 
							
							... 
							
							
							
							Allow passing a custom Pdb subclass via --pdbcls. 
							
						 
						
							2016-07-12 16:45:07 +02:00  
						
					 
				
					
						
							
							
								 
								Antony Lee
							
						 
						
							 
							
							
							
							
								
							
							
								7ee3dd1cb5 
								
							 
						 
						
							
							
								
								Add tests for custom pdb class.  
							
							 
							
							... 
							
							
							
							(and edit CHANGELOG) 
							
						 
						
							2016-07-11 20:07:29 -07:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								458ecae1df 
								
							 
						 
						
							
							
								
								Replace all usages of "pytest_funcarg__" for @pytest.fixture  
							
							 
							
							
							
						 
						
							2016-07-11 22:21:52 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								ad4125dc0d 
								
							 
						 
						
							
							
								
								Deprecate "pytest_funcarg__" prefix to declare fixtures  
							
							 
							
							... 
							
							
							
							Fixes  #1684  
							
						 
						
							2016-07-11 22:21:50 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								5506dc700c 
								
							 
						 
						
							
							
								
								Deprecate yield tests  
							
							 
							
							... 
							
							
							
							Closes  #16 
Closes  #1324  
							
						 
						
							2016-07-11 22:21:49 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								0ca06962e9 
								
							 
						 
						
							
							
								
								Improve docs  
							
							 
							
							
							
						 
						
							2016-07-11 20:33:16 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								fb4da00a32 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/features' into invocation-scoped-fixtures  
							
							 
							
							
							
						 
						
							2016-07-11 20:09:13 -03:00  
						
					 
				
					
						
							
							
								 
								Antony Lee
							
						 
						
							 
							
							
							
							
								
							
							
								6383b53ad9 
								
							 
						 
						
							
							
								
								Allow passing a custom Pdb subclass via --pdbcls.  
							
							 
							
							... 
							
							
							
							This obviates the need for plugins such as `pytest-ipdb`; instead one
can simply call `py.test --pdb=IPython.core.debugger:Pdb` 
							
						 
						
							2016-07-09 21:10:52 -07:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								775100881a 
								
							 
						 
						
							
							
								
								Implement invocation-scoped fixtures  
							
							 
							
							
							
						 
						
							2016-07-09 22:52:05 -03:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								8c49561470 
								
							 
						 
						
							
							
								
								split most fixture related code into own plugin  
							
							 
							
							
							
						 
						
							2016-07-09 20:36:00 +02:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								b9a91dc112 
								
							 
						 
						
							
							
								
								merge from master to features  
							
							 
							
							
							
						 
						
							2016-07-06 11:51:48 +02:00  
						
					 
				
					
						
							
							
								 
								aostr
							
						 
						
							 
							
							
							
							
								
							
							
								94e4a2dd67 
								
							 
						 
						
							
							
								
								* implemented changes recommended by nicoddemus  
							
							 
							
							
							
						 
						
							2016-07-05 15:22:27 +02:00  
						
					 
				
					
						
							
							
								 
								Javier Domingo Cansino
							
						 
						
							 
							
							
							
							
								
							
							
								61e605f60b 
								
							 
						 
						
							
							
								
								Making conftest import failures easier to debug  
							
							 
							
							
							
						 
						
							2016-07-05 10:04:42 +01:00  
						
					 
				
					
						
							
							
								 
								Steffen Allner
							
						 
						
							 
							
							
							
							
								
							
							
								6438895a23 
								
							 
						 
						
							
							
								
								Fix PEP-8.  
							
							 
							
							
							
						 
						
							2016-07-03 22:33:21 +02:00  
						
					 
				
					
						
							
							
								 
								Steffen Allner
							
						 
						
							 
							
							
							
							
								
							
							
								b650c3c118 
								
							 
						 
						
							
							
								
								Implement --setup-show cli flag  
							
							 
							
							... 
							
							
							
							to also be able to see fixture setup with normal test execution. 
							
						 
						
							2016-07-03 22:30:51 +02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								58e558141d 
								
							 
						 
						
							
							
								
								Remove commented out code  
							
							 
							
							
							
						 
						
							2016-06-26 21:19:07 +02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								5891061ac1 
								
							 
						 
						
							
							
								
								Merge pull request  #1675  from kvas-it/issue-1562  
							
							 
							
							... 
							
							
							
							Add warning for assertions on tuples #1562  
							
						 
						
							2016-06-26 16:09:15 -03:00  
						
					 
				
					
						
							
							
								 
								RedBeardCode
							
						 
						
							 
							
							
							
							
								
							
							
								1b0dbd8c40 
								
							 
						 
						
							
							
								
								Move the freezing function from genscript.py to a new module freeze_support.py  
							
							 
							
							
							
						 
						
							2016-06-26 19:37:24 +02:00  
						
					 
				
					
						
							
							
								 
								RedBeardCode
							
						 
						
							 
							
							
							
							
								
							
							
								0e2ebc96ff 
								
							 
						 
						
							
							
								
								Remove deprecated cmd options  
							
							 
							
							... 
							
							
							
							Fixes  #1657  
							
						 
						
							2016-06-26 19:26:04 +02:00  
						
					 
				
					
						
							
							
								 
								aostr
							
						 
						
							 
							
							
							
							
								
							
							
								1ce4670062 
								
							 
						 
						
							
							
								
								* removed tailing whitespaces  
							
							 
							
							
							
						 
						
							2016-06-26 06:51:57 +02:00  
						
					 
				
					
						
							
							
								 
								Vasily Kuznetsov
							
						 
						
							 
							
							
							
							
								
							
							
								c17027e576 
								
							 
						 
						
							
							
								
								Warn about asserts on tuples ( fixes   #1562 )  
							
							 
							
							
							
						 
						
							2016-06-25 19:21:48 +02:00  
						
					 
				
					
						
							
							
								 
								aostr
							
						 
						
							 
							
							
							
							
								
							
							
								e04d9ff80b 
								
							 
						 
						
							
							
								
								* now showing pytest warnings summary by default.  
							
							 
							
							... 
							
							
							
							* added ``--disable-pytest-warnings` flag to let users disable the warnings summary.
* extended/changed unit tests for the changes in the pytest core. 
							
						 
						
							2016-06-25 18:16:13 +02:00  
						
					 
				
					
						
							
							
								 
								RedBeardCode
							
						 
						
							 
							
							
							
							
								
							
							
								e2f550156e 
								
							 
						 
						
							
							
								
								Improve of the test output for logical expression with brackets.  
							
							 
							
							... 
							
							
							
							Fixes  #925  
							
						 
						
							2016-06-25 18:10:36 +02:00  
						
					 
				
					
						
							
							
								 
								Ted Xiao
							
						 
						
							 
							
							
							
							
								
							
							
								856e6cab75 
								
							 
						 
						
							
							
								
								add --override-ini option to overrides ini values  
							
							 
							
							... 
							
							
							
							Signed-off-by: Ted Xiao <xiao.xj@gmail.com> 
							
						 
						
							2016-06-25 23:45:32 +08:00  
						
					 
				
					
						
							
							
								 
								holger krekel
							
						 
						
							 
							
							
							
							
								
							
							
								13a188fe37 
								
							 
						 
						
							
							
								
								Merge pull request  #1647  from sallner/features  
							
							 
							
							... 
							
							
							
							Add new options to report fixture setup and teardown 
							
						 
						
							2016-06-25 16:38:37 +02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								c519b9517a 
								
							 
						 
						
							
							
								
								Merge pull request  #1663  from aostr/master  
							
							 
							
							... 
							
							
							
							Rename the default plugin "pdb" into "debugging" 
							
						 
						
							2016-06-25 09:56:54 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								df17f862fa 
								
							 
						 
						
							
							
								
								Merge pull request  #1648  from blueyed/simplify-Argument-__repr__  
							
							 
							
							... 
							
							
							
							Simplify Argument.__repr__ 
							
						 
						
							2016-06-25 09:26:50 -03:00  
						
					 
				
					
						
							
							
								 
								aostr
							
						 
						
							 
							
							
							
							
								
							
							
								9a5224e2f8 
								
							 
						 
						
							
							
								
								Renamed the pdb module and changed unit tests accordingly  
							
							 
							
							
							
						 
						
							2016-06-25 12:37:31 +02:00  
						
					 
				
					
						
							
							
								 
								Danielle Jenkins
							
						 
						
							 
							
							
							
							
								
							
							
								da5c579d82 
								
							 
						 
						
							
							
								
								Move setupplan and setuponly options to their respective modules.  
							
							 
							
							... 
							
							
							
							Also, changed their group from "general" to "debugconfig". 
							
						 
						
							2016-06-25 12:20:56 +02:00  
						
					 
				
					
						
							
							
								 
								Danielle Jenkins
							
						 
						
							 
							
							
							
							
								
							
							
								032ce8baf6 
								
							 
						 
						
							
							
								
								Switch setuponly and setupplan options to a hook-based implementation.  
							
							 
							
							
							
						 
						
							2016-06-25 12:19:46 +02:00  
						
					 
				
					
						
							
							
								 
								aostr
							
						 
						
							 
							
							
							
							
								
							
							
								05b5554cac 
								
							 
						 
						
							
							
								
								Renamed pytest pdb to debugging which conflicts with python pdb.  
							
							 
							
							... 
							
							
							
							Combining multiple imports the "import pdb" imports the pytest module
as opposed to the python debugger. 
							
						 
						
							2016-06-25 12:09:05 +02:00  
						
					 
				
					
						
							
							
								 
								Florian Bruhin
							
						 
						
							 
							
							
							
							
								
							
							
								757f37f445 
								
							 
						 
						
							
							
								
								Don't ignore ImportError with setuptools plugins  
							
							 
							
							... 
							
							
							
							This was added in b2d66b9e7b  but is a bad
idea. When a plugin can't be imported, commandline options (optionally
set in pytest.ini) could be undefined, which means pytest bails out
much earlier before showing the warning, which is hard to debug.
Fixes  #1479 , also see #1307  and #1497  
							
						 
						
							2016-06-25 09:56:22 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Hahler
							
						 
						
							 
							
							
							
							
								
							
							
								939407ef63 
								
							 
						 
						
							
							
								
								Simplify Argument.__repr__  
							
							 
							
							... 
							
							
							
							I have came across this when noticing that universal-ctags fails to parse
this correctly (https://github.com/universal-ctags/ctags/issues/997 ). 
							
						 
						
							2016-06-25 09:31:31 +02:00  
						
					 
				
					
						
							
							
								 
								Omar Kohl
							
						 
						
							 
							
							
							
							
								
							
							
								d81f23009b 
								
							 
						 
						
							
							
								
								Raise CollectError if pytest.skip() is called during collection  
							
							 
							
							... 
							
							
							
							pytest.skip() must not be used at module level because it can easily be
misunderstood and used as a decorator instead of pytest.mark.skip, causing the
whole module to be skipped instead of just the test being decorated.
This is unexpected for users used to the @unittest.skip decorator and therefore
it is best to bail out with a clean error when it happens.
The pytest equivalent of @unittest.skip is @pytest.mark.skip .
Adapt existing tests that were actually relying on this behaviour and add a
test that explicitly test that collection fails.
fix  #607  
							
						 
						
							2016-06-24 20:56:21 +02:00  
						
					 
				
					
						
							
							
								 
								Tom Viner
							
						 
						
							 
							
							
							
							
								
							
							
								77689eb486 
								
							 
						 
						
							
							
								
								Fixes   #1503  no longer collapse false explanations  
							
							 
							
							
							
						 
						
							2016-06-24 15:35:24 +02:00  
						
					 
				
					
						
							
							
								 
								Tom Viner
							
						 
						
							 
							
							
							
							
								
							
							
								df9918eda3 
								
							 
						 
						
							
							
								
								issue1625, name getfuncargvalue to getfixturevalue  
							
							 
							
							
							
						 
						
							2016-06-24 10:08:19 +02:00  
						
					 
				
					
						
							
							
								 
								Vasily Kuznetsov
							
						 
						
							 
							
							
							
							
								
							
							
								c6af737d4e 
								
							 
						 
						
							
							
								
								Fix fixture parameter display when ids is a function  
							
							 
							
							
							
						 
						
							2016-06-23 10:54:22 +02:00  
						
					 
				
					
						
							
							
								 
								Vasily Kuznetsov
							
						 
						
							 
							
							
							
							
								
							
							
								1a5e530b98 
								
							 
						 
						
							
							
								
								Fix capturing with --setup-only/--setup-plan  
							
							 
							
							
							
						 
						
							2016-06-23 10:23:04 +02:00  
						
					 
				
					
						
							
							
								 
								Stefan Zimmermann
							
						 
						
							 
							
							
							
							
								
							
							
								69bab4ab04 
								
							 
						 
						
							
							
								
								added check for already existing option names to OptionGroup.addoption()  
							
							 
							
							
							
						 
						
							2016-06-22 18:01:35 +02:00  
						
					 
				
					
						
							
							
								 
								Steffen Allner
							
						 
						
							 
							
							
							
							
								
							
							
								dd97a2e7c8 
								
							 
						 
						
							
							
								
								Merge from upstream  
							
							 
							
							
							
						 
						
							2016-06-22 17:51:48 +02:00  
						
					 
				
					
						
							
							
								 
								Vasily Kuznetsov
							
						 
						
							 
							
							
							
							
								
							
							
								61992b4e22 
								
							 
						 
						
							
							
								
								Implement --setup-plan option  
							
							 
							
							
							
						 
						
							2016-06-22 16:45:36 +02:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								18ef7de96b 
								
							 
						 
						
							
							
								
								merge from master again  
							
							 
							
							
							
						 
						
							2016-06-22 16:03:52 +02:00  
						
					 
				
					
						
							
							
								 
								Vasily Kuznetsov
							
						 
						
							 
							
							
							
							
								
							
							
								5e0d78f4f1 
								
							 
						 
						
							
							
								
								Fix .format string failures on python 2.6  
							
							 
							
							
							
						 
						
							2016-06-22 14:53:37 +02:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								083f64100d 
								
							 
						 
						
							
							
								
								merge master into features  
							
							 
							
							
							
						 
						
							2016-06-22 14:39:33 +02:00  
						
					 
				
					
						
							
							
								 
								Vasily Kuznetsov
							
						 
						
							 
							
							
							
							
								
							
							
								2c5c4f3f78 
								
							 
						 
						
							
							
								
								Add printing of fixture dependencies  
							
							 
							
							
							
						 
						
							2016-06-22 12:54:36 +02:00  
						
					 
				
					
						
							
							
								 
								Steffen Allner
							
						 
						
							 
							
							
							
							
								
							
							
								2c6cfa42fa 
								
							 
						 
						
							
							
								
								Disable capturing for setuponly output  
							
							 
							
							
							
						 
						
							2016-06-22 12:14:35 +02:00  
						
					 
				
					
						
							
							
								 
								Steffen Allner
							
						 
						
							 
							
							
							
							
								
							
							
								de9ed5e3f4 
								
							 
						 
						
							
							
								
								Merge pull request  #1  from kvas-it/features  
							
							 
							
							... 
							
							
							
							Factor setuponly code out of runtestprotocol(). 
							
						 
						
							2016-06-22 12:04:45 +02:00  
						
					 
				
					
						
							
							
								 
								Steffen Allner
							
						 
						
							 
							
							
							
							
								
							
							
								92bcc36266 
								
							 
						 
						
							
							
								
								Refactor logging of fixtures  
							
							 
							
							
							
						 
						
							2016-06-22 12:01:51 +02:00  
						
					 
				
					
						
							
							
								 
								Vasily Kuznetsov
							
						 
						
							 
							
							
							
							
								
							
							
								6874c3a3cc 
								
							 
						 
						
							
							
								
								Factor setuponly code out of runtestprotocol().  
							
							 
							
							
							
						 
						
							2016-06-22 11:09:54 +02:00  
						
					 
				
					
						
							
							
								 
								Tom Viner
							
						 
						
							 
							
							
							
							
								
							
							
								98adf204b2 
								
							 
						 
						
							
							
								
								issue 1553: Include terminal newlines in diffs  
							
							 
							
							
							
						 
						
							2016-06-22 09:50:15 +02:00  
						
					 
				
					
						
							
							
								 
								Steffen Allner
							
						 
						
							 
							
							
							
							
								
							
							
								499c9551c8 
								
							 
						 
						
							
							
								
								Implement working version of --setuponly  
							
							 
							
							
							
						 
						
							2016-06-22 09:42:45 +02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								c3ee1c17bc 
								
							 
						 
						
							
							
								
								Merge pull request  #1620  from tomviner/issue460/parameterized-subrequest  
							
							 
							
							... 
							
							
							
							Issue 460: Fail on getfuncargvalue(<fixture with params>) 
							
						 
						
							2016-06-21 13:43:06 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								4350f499b2 
								
							 
						 
						
							
							
								
								Merge branch 'issue1629' of  https://github.com/davehunt/pytest  into features  
							
							 
							
							
							
						 
						
							2016-06-21 18:37:14 +02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								61ede096a3 
								
							 
						 
						
							
							
								
								Merge pull request  #1631  from Avira/master  
							
							 
							
							... 
							
							
							
							help the user in the rare case this assertion actually fails 
							
						 
						
							2016-06-21 13:17:52 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								573866bfad 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/features' into issue-1619-conftest-assert-rewrite  
							
							 
							
							
							
						 
						
							2016-06-21 18:10:19 +02:00  
						
					 
				
					
						
							
							
								 
								Dave Hunt
							
						 
						
							 
							
							
							
							
								
							
							
								ef9dd14963 
								
							 
						 
						
							
							
								
								Introduce pytest command as recommended entry point  
							
							 
							
							... 
							
							
							
							Fixes  #1629  
							
						 
						
							2016-06-21 16:16:57 +02:00  
						
					 
				
					
						
							
							
								 
								Oliver Bestwalter
							
						 
						
							 
							
							
							
							
								
							
							
								2b5c2f3ed5 
								
							 
						 
						
							
							
								
								help the user in the rare case this assertion actually fails  
							
							 
							
							
							
						 
						
							2016-06-21 14:57:48 +02:00  
						
					 
				
					
						
							
							
								 
								Omar Kohl
							
						 
						
							 
							
							
							
							
								
							
							
								ede7478dcc 
								
							 
						 
						
							
							
								
								Exit pytest on collection error (without executing tests)  
							
							 
							
							... 
							
							
							
							Add --continue-on-collection-errors option to restore the previous behaviour:
Execute tests (that were successfully collected) even when collection errors
happen.
Some tests had to be modified e.g. because the return code changed to 2
(EXIT_INTERRUPTED) instead of 1 (EXIT_TESTSFAILED) because an Interrupted
exception is raised on collection error.
Implemented via pair programming with:
    Oleg Pidsadnyi <oleg.pidsadnyi@gmail.com>
closes  #1421  
							
						 
						
							2016-06-21 13:32:34 +02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								819942e964 
								
							 
						 
						
							
							
								
								Return explicit None from rewrite hook's find_module  
							
							 
							
							
							
						 
						
							2016-06-21 12:28:36 +02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								8b0fb47c79 
								
							 
						 
						
							
							
								
								Remove print left by accident  
							
							 
							
							
							
						 
						
							2016-06-21 12:23:12 +02:00  
						
					 
				
					
						
							
							
								 
								Tom Viner
							
						 
						
							 
							
							
							
							
								
							
							
								5854a71ece 
								
							 
						 
						
							
							
								
								Issue 460: getfuncargvalue fixture w. params err  
							
							 
							
							
							
						 
						
							2016-06-21 11:29:21 +02:00  
						
					 
				
					
						
							
							
								 
								Floris Bruynooghe
							
						 
						
							 
							
							
							
							
								
							
							
								9118c0222f 
								
							 
						 
						
							
							
								
								Merge .set_config() into constructor  
							
							 
							
							
							
						 
						
							2016-06-21 09:28:10 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Hahler
							
						 
						
							 
							
							
							
							
								
							
							
								e53e45b55c 
								
							 
						 
						
							
							
								
								tests: getexecutable: call `--version` on all Pythons  
							
							 
							
							... 
							
							
							
							This should prevent errors from pyenv:
    pyenv: python2.6: command not found
    The `python2.6' command exists in these Python versions:
      2.6.9
While the pyenv wrapper explicitly returns 127, I think it is better to
just check for non-zero?! 
							
						 
						
							2016-06-21 08:36:02 +02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								3a81d2e012 
								
							 
						 
						
							
							
								
								conftest files now use assertion rewriting  
							
							 
							
							... 
							
							
							
							Fix  #1619  
							
						 
						
							2016-06-20 23:13:29 +02:00  
						
					 
				
					
						
							
							
								 
								Florian Bruhin
							
						 
						
							 
							
							
							
							
								
							
							
								4f2db6c08d 
								
							 
						 
						
							
							
								
								Merge pull request  #1616  from palaviv/pytest.raises-message  
							
							 
							
							... 
							
							
							
							Pytest.raises custom error message 
							
						 
						
							2016-06-20 18:43:12 +02:00  
						
					 
				
					
						
							
							
								 
								palaviv
							
						 
						
							 
							
							
							
							
								
							
							
								f8d4cadc3d 
								
							 
						 
						
							
							
								
								Added versionchanged directives  
							
							 
							
							
							
						 
						
							2016-06-19 23:56:43 +03:00  
						
					 
				
					
						
							
							
								 
								palaviv
							
						 
						
							 
							
							
							
							
								
							
							
								c29130d400 
								
							 
						 
						
							
							
								
								Updated documentation  
							
							 
							
							
							
						 
						
							2016-06-19 23:34:42 +03:00  
						
					 
				
					
						
							
							
								 
								palaviv
							
						 
						
							 
							
							
							
							
								
							
							
								ca093673fb 
								
							 
						 
						
							
							
								
								pytest.raises accept cutom message only when used as context manager  
							
							 
							
							
							
						 
						
							2016-06-19 21:24:47 +03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								d81ee9acfb 
								
							 
						 
						
							
							
								
								Merge pull request  #1597  from taschini/pyargs-fix  
							
							 
							
							... 
							
							
							
							Ensure that a module within a namespace package can be found by --pyargs 
							
						 
						
							2016-06-19 14:20:52 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								72bf11cbe9 
								
							 
						 
						
							
							
								
								Add disabled() method to capsys and capfd  
							
							 
							
							... 
							
							
							
							Fix  #1599  
							
						 
						
							2016-06-19 19:14:36 +02:00  
						
					 
				
					
						
							
							
								 
								palaviv
							
						 
						
							 
							
							
							
							
								
							
							
								d21886c005 
								
							 
						 
						
							
							
								
								pytest.raises accpets custom message  
							
							 
							
							
							
						 
						
							2016-06-16 20:15:32 +03:00  
						
					 
				
					
						
							
							
								 
								Greg Price
							
						 
						
							 
							
							
							
							
								
							
							
								ab8b2e75a3 
								
							 
						 
						
							
							
								
								Simplify default pytest_runtestloop  
							
							 
							
							... 
							
							
							
							The inner function and the explanatory comment it makes necessary can
all be removed if we switch to an if/else rather than try/except for
this condition.
Perhaps this bit comes from my fondness for C, but I think I would
find this style clearer and easier to understand even if it weren't
for the Python 2 quirk that makes the other style require us to add an
unnecessary-looking function abstraction.  In any case, given that the
alternative does require that abstraction this is definitely simpler. 
							
						 
						
							2016-06-15 18:27:08 -07:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								308396ae3c 
								
							 
						 
						
							
							
								
								Merge pull request  #1606  from hackebrot/show-fixtures-per-test  
							
							 
							
							... 
							
							
							
							Show fixtures per test 
							
						 
						
							2016-06-14 09:54:18 -03:00  
						
					 
				
					
						
							
							
								 
								taschini
							
						 
						
							 
							
							
							
							
								
							
							
								4d9e293b4d 
								
							 
						 
						
							
							
								
								Incorporated feedback ( #1597 ).  
							
							 
							
							... 
							
							
							
							Fixed problem caused in a test on Windows by file left open by PyPy and not immediately garbage collected. 
							
						 
						
							2016-06-14 07:12:40 +02:00  
						
					 
				
					
						
							
							
								 
								taschini
							
						 
						
							 
							
							
							
							
								
							
							
								e2e6e31711 
								
							 
						 
						
							
							
								
								Ensure that a module within a namespace package can be found by --pyargs.  
							
							 
							
							
							
						 
						
							2016-06-14 07:12:40 +02:00  
						
					 
				
					
						
							
							
								 
								Raphael Pierzina
							
						 
						
							 
							
							
							
							
								
							
							
								adc50ac72f 
								
							 
						 
						
							
							
								
								Change format for test function locations  
							
							 
							
							
							
						 
						
							2016-06-12 15:58:32 +01:00  
						
					 
				
					
						
							
							
								 
								Guyzmo
							
						 
						
							 
							
							
							
							
								
							
							
								accd962c9f 
								
							 
						 
						
							
							
								
								Fixed issue shadowing error when missing argument on teardown_method  
							
							 
							
							... 
							
							
							
							When the method argument is missing on teardown_method, the traceback is
100% internal to pytest, which with default options get pruned. Then
that traceback is empty, leading to a new exception as a traceback shall
not be empty.
This PR fixes that issue by pushing back the last stack on the
traceback, when the stacktrace is empty after pruning. Then the output
is still pruned, but gives meaningful information with the item where it
failed on the stack.
* fixes issue #1604 
Signed-off-by: Guyzmo <guyzmo+github@m0g.net> 
							
						 
						
							2016-06-12 03:45:24 +02:00  
						
					 
				
					
						
							
							
								 
								Raphael Pierzina
							
						 
						
							 
							
							
							
							
								
							
							
								b99aace8a9 
								
							 
						 
						
							
							
								
								Fix py26 by using indices in str.format  
							
							 
							
							
							
						 
						
							2016-06-12 00:52:03 +01:00  
						
					 
				
					
						
							
							
								 
								Raphael Pierzina
							
						 
						
							 
							
							
							
							
								
							
							
								7eea168106 
								
							 
						 
						
							
							
								
								Implement show_fixtures_per_test and add cli flag  
							
							 
							
							
							
						 
						
							2016-06-12 00:20:06 +01:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								bdc29968b8 
								
							 
						 
						
							
							
								
								Remove dead code and simplify code in call_fixture_func  
							
							 
							
							
							
						 
						
							2016-06-08 21:07:56 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								98acda426f 
								
							 
						 
						
							
							
								
								Remove yieldctx variable being passed around  
							
							 
							
							
							
						 
						
							2016-06-08 21:07:50 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								d712428d33 
								
							 
						 
						
							
							
								
								Fix custom name for yield_fixtures  
							
							 
							
							
							
						 
						
							2016-06-08 21:07:49 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								366879db27 
								
							 
						 
						
							
							
								
								Make normal fixtures work with "yield"  
							
							 
							
							
							
						 
						
							2016-06-08 21:07:47 -03:00  
						
					 
				
					
						
							
							
								 
								marscher
							
						 
						
							 
							
							
							
							
								
							
							
								09d163aa3a 
								
							 
						 
						
							
							
								
								[exception handling] Fix case the current working directory (CWD) gets deleted during testing.  
							
							 
							
							... 
							
							
							
							Fixes  #1235 . 
							
						 
						
							2016-06-08 15:18:23 +02:00  
						
					 
				
					
						
							
							
								 
								Thomas Grainger
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								74862b8f2f 
								
							 
						 
						
							
							
								
								Don't mark empty doctest files as skipped,  fixes   #1578  
							
							 
							
							
							
						 
						
							2016-06-01 19:19:14 +01:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								fad6266a47 
								
							 
						 
						
							
							
								
								finish up the version bump in __init__ i forgot  
							
							 
							
							
							
						 
						
							2016-06-01 08:18:10 +02:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								b5bd4d959d 
								
							 
						 
						
							
							
								
								merge master to features  
							
							 
							
							
							
						 
						
							2016-06-01 08:13:26 +02:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								85541113eb 
								
							 
						 
						
							
							
								
								update version  
							
							 
							
							
							
						 
						
							2016-05-31 19:05:36 +02:00  
						
					 
				
					
						
							
							
								 
								Raphael Pierzina
							
						 
						
							 
							
							
							
							
								
							
							
								0d80a9c729 
								
							 
						 
						
							
							
								
								Change _showfixtures_main to loop over fixturedefs  
							
							 
							
							
							
						 
						
							2016-05-31 11:47:16 +01:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								158f3cfaea 
								
							 
						 
						
							
							
								
								merge master  
							
							 
							
							
							
						 
						
							2016-05-31 11:24:53 +02:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								afc5c7e4f6 
								
							 
						 
						
							
							
								
								better message for empty argument skip  
							
							 
							
							... 
							
							
							
							include the argument names to help determining the fixture/parametrization 
							
						 
						
							2016-05-30 14:42:55 +02:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								03eb9203fd 
								
							 
						 
						
							
							
								
								remove the old empty argument triggers  
							
							 
							
							... 
							
							
							
							unlike the marker based one its not composable 
							
						 
						
							2016-05-30 14:41:00 +02:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								d217b52508 
								
							 
						 
						
							
							
								
								fix   #510  by adding a describing skip marker on empty parameterize  
							
							 
							
							
							
						 
						
							2016-05-30 14:34:38 +02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								8c1be624a6 
								
							 
						 
						
							
							
								
								Merge pull request  #1554  from RonnyPfannschmidt/merge-master  
							
							 
							
							... 
							
							
							
							Merge master into features 
							
						 
						
							2016-05-24 11:09:33 -03:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								16794feaf6 
								
							 
						 
						
							
							
								
								Merge branch 'master' into merge-master  
							
							 
							
							
							
						 
						
							2016-05-24 08:15:10 +02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								9fb5ddf778 
								
							 
						 
						
							
							
								
								Fix shell argument split in win32  
							
							 
							
							... 
							
							
							
							This fixes the bug inserted by accident in #1523  
							
						 
						
							2016-05-23 20:41:47 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								5ab5a11544 
								
							 
						 
						
							
							
								
								Merge pull request  #1565  from tomviner/issue1544/ignore-build-dist-dirs  
							
							 
							
							... 
							
							
							
							Issue 1544: norecursedirs build & dist dirs 
							
						 
						
							2016-05-23 19:30:20 -03:00  
						
					 
				
					
						
							
							
								 
								TomV
							
						 
						
							 
							
							
							
							
								
							
							
								d6dfb1a393 
								
							 
						 
						
							
							
								
								issue 1544: norecursedirs build & dist dirs  
							
							 
							
							
							
						 
						
							2016-05-23 21:02:29 +01:00  
						
					 
				
					
						
							
							
								 
								AbdealiJK
							
						 
						
							 
							
							
							
							
								
							
							
								d4c9fa9f1a 
								
							 
						 
						
							
							
								
								unittest.UnitTestCase: Allow __test__ for methods  
							
							 
							
							... 
							
							
							
							__test__ needs to be checked for methods of a class too. Earlier,
this was not done, and all methods in a class was assumed to be
a test. This commit adds the appropriate condition to ensure that
if the __test__ is set to False, it does not collect that method.
Fixes https://github.com/pytest-dev/pytest/issues/1558  
							
						 
						
							2016-05-19 08:19:57 +05:30  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								eab762ea99 
								
							 
						 
						
							
							
								
								Merge branch 'master' into merge-master  
							
							 
							
							
							
						 
						
							2016-05-13 19:37:41 +02:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								c49863aa63 
								
							 
						 
						
							
							
								
								merge next chunk from master and fix changelog linting issue  
							
							 
							
							
							
						 
						
							2016-05-13 19:36:47 +02:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								01d2ff804b 
								
							 
						 
						
							
							
								
								Merge commit '56156bb119194014129ac08c4a2c370f0b893104' into merge-master  
							
							 
							
							
							
						 
						
							2016-05-13 17:55:02 +02:00  
						
					 
				
					
						
							
							
								 
								John Towler
							
						 
						
							 
							
							
							
							
								
							
							
								0d07b64571 
								
							 
						 
						
							
							
								
								Fixes Issue 1549  
							
							 
							
							
							
						 
						
							2016-05-05 11:29:05 -07:00  
						
					 
				
					
						
							
							
								 
								Benjamin Dopplinger
							
						 
						
							 
							
							
							
							
								
							
							
								75abfbe8d4 
								
							 
						 
						
							
							
								
								Fix typo in doc  
							
							 
							
							
							
						 
						
							2016-04-28 14:40:17 +10:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								6cc56b4a1b 
								
							 
						 
						
							
							
								
								Merge pull request  #1535  from palaviv/parametrize-test-ids-hook  
							
							 
							
							... 
							
							
							
							introduce pytest_make_parametrize_id hook 
							
						 
						
							2016-04-27 16:16:16 +02:00  
						
					 
				
					
						
							
							
								 
								palaviv
							
						 
						
							 
							
							
							
							
								
							
							
								9733127951 
								
							 
						 
						
							
							
								
								pytest_make_parametrize_id receive config object  
							
							 
							
							
							
						 
						
							2016-04-26 10:23:57 +03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								fdee88f086 
								
							 
						 
						
							
							
								
								Merge pull request  #1520  from omarkohl/invalid_test_module_name  
							
							 
							
							... 
							
							
							
							Raise CollectError if import test module fails 
							
						 
						
							2016-04-25 21:42:41 -03:00  
						
					 
				
					
						
							
							
								 
								palaviv
							
						 
						
							 
							
							
							
							
								
							
							
								53429ed8b8 
								
							 
						 
						
							
							
								
								Added hook to plugin docs and new CHANGELOG record  
							
							 
							
							
							
						 
						
							2016-04-25 18:03:34 +03:00  
						
					 
				
					
						
							
							
								 
								palaviv
							
						 
						
							 
							
							
							
							
								
							
							
								b9faf78d51 
								
							 
						 
						
							
							
								
								Added test_pytest_make_parametrize_id  
							
							 
							
							
							
						 
						
							2016-04-25 17:48:28 +03:00  
						
					 
				
					
						
							
							
								 
								palaviv
							
						 
						
							 
							
							
							
							
								
							
							
								79927428d1 
								
							 
						 
						
							
							
								
								Added pytest_make_parametrize_id hook  
							
							 
							
							
							
						 
						
							2016-04-25 17:11:47 +03:00  
						
					 
				
					
						
							
							
								 
								Omar Kohl
							
						 
						
							 
							
							
							
							
								
							
							
								56855893ca 
								
							 
						 
						
							
							
								
								Raise CollectError if import test module fails  
							
							 
							
							... 
							
							
							
							One of the reasons for failing to import the test module is invalid Python
identifiers in the full package path of the test module.
fix  #1426  
							
						 
						
							2016-04-23 13:50:48 +02:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								6d661ace0a 
								
							 
						 
						
							
							
								
								Merge pull request  #1523  from MengJueM/master  
							
							 
							
							
							
						 
						
							2016-04-20 16:55:31 +02:00  
						
					 
				
					
						
							
							
								 
								Florian Bruhin
							
						 
						
							 
							
							
							
							
								
							
							
								aa87395c39 
								
							 
						 
						
							
							
								
								Use py.builtin.callable  
							
							 
							
							... 
							
							
							
							This restores compatibility with Python 3.0/3.1 
							
						 
						
							2016-04-20 11:18:47 +02:00  
						
					 
				
					
						
							
							
								 
								Florian Bruhin
							
						 
						
							 
							
							
							
							
								
							
							
								75160547f2 
								
							 
						 
						
							
							
								
								Use a callable __tracebackhide__ for filtering  
							
							 
							
							... 
							
							
							
							While this leads to slightly more complicated user code for the common
case (checking if the exception is of a given type) it's easier to
implement and more flexible. 
							
						 
						
							2016-04-20 11:09:27 +02:00  
						
					 
				
					
						
							
							
								 
								Florian Bruhin
							
						 
						
							 
							
							
							
							
								
							
							
								b607f6728f 
								
							 
						 
						
							
							
								
								Filter selectively with __tracebackhide__  
							
							 
							
							... 
							
							
							
							When __tracebackhide__ gets set to an exception type or list/tuple of
exception types, only those exceptions get filtered, while the full
traceback is shown if another exception (e.g. a bug in a assertion
helper) happens. 
							
						 
						
							2016-04-20 10:25:33 +02:00  
						
					 
				
					
						
							
							
								 
								Florian Bruhin
							
						 
						
							 
							
							
							
							
								
							
							
								c24e8e01b4 
								
							 
						 
						
							
							
								
								Fix TracebackItem documentation in pytest.code  
							
							 
							
							... 
							
							
							
							The TracebackItem class does not exist, but it seems the docstrings refer to
TracebackEntry. 
							
						 
						
							2016-04-20 08:35:17 +02:00  
						
					 
				
					
						
							
							
								 
								MengJueM
							
						 
						
							 
							
							
							
							
								
							
							
								1a37035d71 
								
							 
						 
						
							
							
								
								Add test test_absolute_win32_path  
							
							 
							
							
							
						 
						
							2016-04-20 01:27:37 +08:00  
						
					 
				
					
						
							
							
								 
								TomV
							
						 
						
							 
							
							
							
							
								
							
							
								99c4b6fdc3 
								
							 
						 
						
							
							
								
								issue 1496 - xfail with condition keyword  
							
							 
							
							
							
						 
						
							2016-04-19 18:12:37 +01:00  
						
					 
				
					
						
							
							
								 
								Meng Jue
							
						 
						
							 
							
							
							
							
								
							
							
								dd2425675b 
								
							 
						 
						
							
							
								
								Fix a small issue about shlex.split not working well with win32 path  
							
							 
							
							
							
						 
						
							2016-04-19 13:08:08 +08:00  
						
					 
				
					
						
							
							
								 
								Martin Prusse
							
						 
						
							 
							
							
							
							
								
							
							
								7ce5873da2 
								
							 
						 
						
							
							
								
								Perform a "unicode aware" check for maximum recursion depth error  
							
							 
							
							... 
							
							
							
							Avoid errors `UnicodeErrosr`s due non maximum recursion depth errors
when checking for those errors. 
							
						 
						
							2016-04-08 23:32:18 -03:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								0f7aeafe7c 
								
							 
						 
						
							
							
								
								Merge pull request  #1486  from roolebo/fix-issue-138  
							
							 
							
							... 
							
							
							
							Fix issue #138  - support chained exceptions 
							
						 
						
							2016-04-03 19:21:57 +02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								e3bc6faa2b 
								
							 
						 
						
							
							
								
								Merge pull request  #1470  from ceridwen/features  
							
							 
							
							... 
							
							
							
							Escape both bytes and unicode strings for "ids" in Metafunc.parametrize 
							
						 
						
							2016-04-03 13:48:30 -03:00  
						
					 
				
					
						
							
							
								 
								Omar Kohl
							
						 
						
							 
							
							
							
							
								
							
							
								c578226d43 
								
							 
						 
						
							
							
								
								Implement ExceptionInfo.match() to match regexp on str(exception)  
							
							 
							
							... 
							
							
							
							This implements similar functionality to
unittest.TestCase.assertRegexpMatches()
closes  #372  
							
						 
						
							2016-04-03 11:22:44 +02:00  
						
					 
				
					
						
							
							
								 
								Ceridwen
							
						 
						
							 
							
							
							
							
								
							
							
								23a8e2b469 
								
							 
						 
						
							
							
								
								Add .hypothesis to .gitignore and try an older version of Hypothesis for 2.6  
							
							 
							
							
							
						 
						
							2016-04-02 11:47:37 -04:00  
						
					 
				
					
						
							
							
								 
								Ceridwen
							
						 
						
							 
							
							
							
							
								
							
							
								491b30c5d9 
								
							 
						 
						
							
							
								
								Add Hypothesis test for _idval and fix bug it found  
							
							 
							
							
							
						 
						
							2016-04-01 22:45:44 -04:00  
						
					 
				
					
						
							
							
								 
								Tyler Goodlet
							
						 
						
							 
							
							
							
							
								
							
							
								053c052190 
								
							 
						 
						
							
							
								
								Always lstrip() keyword expression  
							
							 
							
							
							
						 
						
							2016-04-01 13:10:05 -04:00  
						
					 
				
					
						
							
							
								 
								Ceridwen
							
						 
						
							 
							
							
							
							
								
							
							
								9b438d56e8 
								
							 
						 
						
							
							
								
								Fix a test_unicode_idval_python2 (now test_unicode_idval) and associated string handling on Python 3  
							
							 
							
							
							
						 
						
							2016-04-01 12:27:17 -04:00  
						
					 
				
					
						
							
							
								 
								Roman Bolshakov
							
						 
						
							 
							
							
							
							
								
							
							
								89df701ae9 
								
							 
						 
						
							
							
								
								Comment a workaround for  #1485 .  
							
							 
							
							
							
						 
						
							2016-03-27 13:15:56 +03:00  
						
					 
				
					
						
							
							
								 
								palaviv
							
						 
						
							 
							
							
							
							
								
							
							
								c66aedfa65 
								
							 
						 
						
							
							
								
								checking first there are duplciates ids before changing to unique names  
							
							 
							
							
							
						 
						
							2016-03-23 18:47:27 +02:00  
						
					 
				
					
						
							
							
								 
								palaviv
							
						 
						
							 
							
							
							
							
								
							
							
								b8c15a0215 
								
							 
						 
						
							
							
								
								improved idmaker name selection in case of duplicate ids  
							
							 
							
							
							
						 
						
							2016-03-23 00:20:58 +02:00  
						
					 
				
					
						
							
							
								 
								Ceridwen
							
						 
						
							 
							
							
							
							
								
							
							
								1f46015de5 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/features' into features  
							
							 
							
							
							
						 
						
							2016-03-22 16:22:00 -04:00  
						
					 
				
					
						
							
							
								 
								Quentin Pradet
							
						 
						
							 
							
							
							
							
								
							
							
								653a53226a 
								
							 
						 
						
							
							
								
								Add strict parameter to xfail marker doc  
							
							 
							
							
							
						 
						
							2016-03-22 16:01:51 +04:00  
						
					 
				
					
						
							
							
								 
								Quentin Pradet
							
						 
						
							 
							
							
							
							
								
							
							
								1fbd19b8cb 
								
							 
						 
						
							
							
								
								Fix pytest.mark.skip mark when used in strict mode  
							
							 
							
							
							
						 
						
							2016-03-22 15:40:34 +04:00  
						
					 
				
					
						
							
							
								 
								Ceridwen
							
						 
						
							 
							
							
							
							
								
							
							
								4405dd0ffe 
								
							 
						 
						
							
							
								
								Escape both bytes and unicode strings for "ids" in Metafunc.parametrize  
							
							 
							
							
							
						 
						
							2016-03-22 01:31:48 -04:00  
						
					 
				
					
						
							
							
								 
								palaviv
							
						 
						
							 
							
							
							
							
								
							
							
								7885e43b78 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/features' into allow-none-as-parametrized-test-id  
							
							 
							
							
							
						 
						
							2016-03-20 18:57:17 +02:00  
						
					 
				
					
						
							
							
								 
								palaviv
							
						 
						
							 
							
							
							
							
								
							
							
								32f44ce2fd 
								
							 
						 
						
							
							
								
								updated parametrize documentation  
							
							 
							
							
							
						 
						
							2016-03-20 18:54:48 +02:00  
						
					 
				
					
						
							
							
								 
								Roman Bolshakov
							
						 
						
							 
							
							
							
							
								
							
							
								a736e26734 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'pytest-dev/master' into fix-issue-138  
							
							 
							
							
							
						 
						
							2016-03-20 01:04:22 +03:00  
						
					 
				
					
						
							
							
								 
								Roman Bolshakov
							
						 
						
							 
							
							
							
							
								
							
							
								fbc5ba08d9 
								
							 
						 
						
							
							
								
								Fix issue  #138  
							
							 
							
							
							
						 
						
							2016-03-20 01:02:17 +03:00  
						
					 
				
					
						
							
							
								 
								palaviv
							
						 
						
							 
							
							
							
							
								
							
							
								be1954afbc 
								
							 
						 
						
							
							
								
								allow None to be passed in ids list for specific test and recieve idmaker name for test  
							
							 
							
							
							
						 
						
							2016-03-19 21:22:49 +02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								5fcce8a7d6 
								
							 
						 
						
							
							
								
								Merge branch 'master' into merge-master-into-features  
							
							 
							
							
							
						 
						
							2016-03-18 18:26:56 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								a70e92777f 
								
							 
						 
						
							
							
								
								Bump version to 2.9.2.dev1  
							
							 
							
							
							
						 
						
							2016-03-18 18:24:24 -03:00  
						
					 
				
					
						
							
							
								 
								nicoddemus
							
						 
						
							 
							
							
							
							
								
							
							
								9bdf51fcc5 
								
							 
						 
						
							
							
								
								Bump version to 2.9.1  
							
							 
							
							
							
						 
						
							2016-03-17 17:03:46 -04:00  
						
					 
				
					
						
							
							
								 
								Tareq Alayan
							
						 
						
							 
							
							
							
							
								
							
							
								fa6acdcfd4 
								
							 
						 
						
							
							
								
								junitxml: add properties node in testsuite level  
							
							 
							
							... 
							
							
							
							The commit allow users to add a properties node in testsuite level see
example below:
<testsuite errors="0" failures="0" name="pytest" skips="1" tests="1"
time="11.824">
  <properties>
    <property name="ARCH" value="PPC"/>
    <property name="OS" value="RHEL 7.2"/>
    <property name="TestPlanURL" value="https://url .."/>
    <property name="Automated" value="True"/>
  </properties>
  <testcase classname="git.....>
  </testcase>
</testsuite>
The current situation is that properties node can be added to every
testcase node. However, sometimes we need some global properties that
applies to all testcases and give better description for the testsuite
itself. 
							
						 
						
							2016-03-16 13:24:33 +02:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								d70596da91 
								
							 
						 
						
							
							
								
								Merge pull request  #1452  from palaviv/specify-paramterized-node-in-command-line  
							
							 
							
							... 
							
							
							
							Specify paramterized node in command line - fixes  #649  
							
						 
						
							2016-03-16 11:16:54 +01:00  
						
					 
				
					
						
							
							
								 
								palaviv
							
						 
						
							 
							
							
							
							
								
							
							
								a1277aaf0e 
								
							 
						 
						
							
							
								
								added TODO comment to remove the parametrized workaround  
							
							 
							
							
							
						 
						
							2016-03-15 23:42:25 +02:00  
						
					 
				
					
						
							
							
								 
								Kale Kundert
							
						 
						
							 
							
							
							
							
								
							
							
								5ceee08590 
								
							 
						 
						
							
							
								
								Fix CHANGELOG merge conflicts.  
							
							 
							
							
							
						 
						
							2016-03-14 11:55:50 -07:00  
						
					 
				
					
						
							
							
								 
								Kale Kundert
							
						 
						
							 
							
							
							
							
								
							
							
								0dcc862a56 
								
							 
						 
						
							
							
								
								Fix some typos in the documentation.  
							
							 
							
							
							
						 
						
							2016-03-14 11:38:00 -07:00  
						
					 
				
					
						
							
							
								 
								Kale Kundert
							
						 
						
							 
							
							
							
							
								
							
							
								9e7206a1cf 
								
							 
						 
						
							
							
								
								Fix a few stylistic issues.  
							
							 
							
							
							
						 
						
							2016-03-14 11:29:45 -07:00  
						
					 
				
					
						
							
							
								 
								palaviv
							
						 
						
							 
							
							
							
							
								
							
							
								1ee3d40dbe 
								
							 
						 
						
							
							
								
								allow parametrized nodes to be specified from command line  
							
							 
							
							
							
						 
						
							2016-03-13 23:37:21 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Hahler
							
						 
						
							 
							
							
							
							
								
							
							
								bdddc9c38b 
								
							 
						 
						
							
							
								
								doc: fix argument order for pytest_load_initial_conftests  
							
							 
							
							
							
						 
						
							2016-03-12 17:35:27 +01:00  
						
					 
				
					
						
							
							
								 
								Kale Kundert
							
						 
						
							 
							
							
							
							
								
							
							
								916c0a8b36 
								
							 
						 
						
							
							
								
								Fix Decimal() and __ne__() errors.  
							
							 
							
							
							
						 
						
							2016-03-11 16:29:18 -08:00  
						
					 
				
					
						
							
							
								 
								Kale Kundert
							
						 
						
							 
							
							
							
							
								
							
							
								078448008c 
								
							 
						 
						
							
							
								
								Discuss alternative float comparison algorithms.  
							
							 
							
							
							
						 
						
							2016-03-11 15:59:48 -08:00  
						
					 
				
					
						
							
							
								 
								Kale Kundert
							
						 
						
							 
							
							
							
							
								
							
							
								42a7e0488d 
								
							 
						 
						
							
							
								
								Properly handle inf, nan, and built-in numeric types.  
							
							 
							
							... 
							
							
							
							This commit also:
- Dramatically increases the number of unit tests , mostly by borrowing
  from the standard  library's unit tests for math.isclose().
- Refactors approx() into two classes, one of which handles comparing
  individual numbers (ApproxNonIterable) and another which uses the
  first to compare individual numbers or sequences of numbers. 
							
						 
						
							2016-03-11 08:49:26 -08:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								4636bf6160 
								
							 
						 
						
							
							
								
								Merge pull request  #1391  from malinoff/issue1342  
							
							 
							
							... 
							
							
							
							LastFailed now creates .cache only when needed. Fixes  #1342  
							
						 
						
							2016-03-11 11:18:50 +01:00  
						
					 
				
					
						
							
							
								 
								Dmitry Malinovsky
							
						 
						
							 
							
							
							
							
								
							
							
								52a5acda92 
								
							 
						 
						
							
							
								
								Use testscollected to make xdist happy  
							
							 
							
							
							
						 
						
							2016-03-11 14:48:17 +06:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								3ea987ef9d 
								
							 
						 
						
							
							
								
								Copy over name and path attributes to the re-raised exception  
							
							 
							
							
							
						 
						
							2016-03-10 18:13:59 -03:00  
						
					 
				
					
						
							
							
								 
								Mike Lundy
							
						 
						
							 
							
							
							
							
								
							
							
								9577120592 
								
							 
						 
						
							
							
								
								Allow custom fixture names for fixtures  
							
							 
							
							... 
							
							
							
							When defining a fixture in the same module as where it is used, the
function argument shadows the fixture name, which a) annoys pylint and
b) can lead to bugs where you forget to request a fixture into a test
method.
This allows one to define fixtures with a different name than the name
of the function, bypassing that problem. 
							
						 
						
							2016-03-09 14:58:54 -08:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								7a186df271 
								
							 
						 
						
							
							
								
								Improve error message when a plugin fails to import  
							
							 
							
							
							
						 
						
							2016-03-08 19:18:13 -03:00  
						
					 
				
					
						
							
							
								 
								Kale Kundert
							
						 
						
							 
							
							
							
							
								
							
							
								7d155bd3cf 
								
							 
						 
						
							
							
								
								Fix sys.version_info errors.  
							
							 
							
							
							
						 
						
							2016-03-08 10:12:31 -08:00  
						
					 
				
					
						
							
							
								 
								Kale Kundert
							
						 
						
							 
							
							
							
							
								
							
							
								6a902924f8 
								
							 
						 
						
							
							
								
								Fix trailing whitespace errors.  
							
							 
							
							
							
						 
						
							2016-03-07 19:56:23 -08:00  
						
					 
				
					
						
							
							
								 
								Kale Kundert
							
						 
						
							 
							
							
							
							
								
							
							
								c9c73b8d8e 
								
							 
						 
						
							
							
								
								Fix zero-length field name error in python2.6  
							
							 
							
							
							
						 
						
							2016-03-07 19:54:43 -08:00  
						
					 
				
					
						
							
							
								 
								Kale Kundert
							
						 
						
							 
							
							
							
							
								
							
							
								5dab0954a0 
								
							 
						 
						
							
							
								
								Add approx() to the Sphinx docs.  
							
							 
							
							
							
						 
						
							2016-03-07 18:14:49 -08:00  
						
					 
				
					
						
							
							
								 
								Kale Kundert
							
						 
						
							 
							
							
							
							
								
							
							
								b8a8382c2c 
								
							 
						 
						
							
							
								
								Reduce the default absolute error threshold to 1e-12.  
							
							 
							
							
							
						 
						
							2016-03-07 16:43:53 -08:00  
						
					 
				
					
						
							
							
								 
								Kale Kundert
							
						 
						
							 
							
							
							
							
								
							
							
								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  
						
					 
				
					
						
							
							
								 
								Kale Kundert
							
						 
						
							 
							
							
							
							
								
							
							
								dd28e28b34 
								
							 
						 
						
							
							
								
								Make a few stylistic improvements.  
							
							 
							
							
							
						 
						
							2016-03-07 10:10:54 -08:00  
						
					 
				
					
						
							
							
								 
								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  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								fd0010e6e9 
								
							 
						 
						
							
							
								
								Merge pull request  #1439  from pytest-dev/fix-1178  
							
							 
							
							... 
							
							
							
							Support pytest.fail with non-ascii characters
Fixes  #1178  
							
						 
						
							2016-03-06 06:42:35 +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
							
						 
						
							 
							
							
							
							
								
							
							
								5d4703852e 
								
							 
						 
						
							
							
								
								Add test when using native strings with non-ascii chars  
							
							 
							
							
							
						 
						
							2016-03-05 19:34:15 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								d8403d793f 
								
							 
						 
						
							
							
								
								Fix decoding issue while formatting SyntaxErrors during collection  
							
							 
							
							... 
							
							
							
							This happens only in Python 2, as in Python 3 we receive
the "badline" in the exception is already properly encoded
Fix  #578  
							
						 
						
							2016-03-05 16:58:50 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								24d3e01548 
								
							 
						 
						
							
							
								
								pytest.fail with non-ascii characters raises an internal pytest error  
							
							 
							
							... 
							
							
							
							Fix  #1178  
							
						 
						
							2016-03-05 16:09:01 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								819e0ead44 
								
							 
						 
						
							
							
								
								Mention that pytest_addoption may be used from conftest files  
							
							 
							
							... 
							
							
							
							fix  #1427  
							
						 
						
							2016-03-03 18:26:01 -03:00  
						
					 
				
					
						
							
							
								 
								TomV
							
						 
						
							 
							
							
							
							
								
							
							
								28530836c9 
								
							 
						 
						
							
							
								
								issue469: add fix junit double colon split issue  
							
							 
							
							
							
						 
						
							2016-03-02 22:18:57 +00:00  
						
					 
				
					
						
							
							
								 
								Matt Williams
							
						 
						
							 
							
							
							
							
								
							
							
								891e029518 
								
							 
						 
						
							
							
								
								Add a new doctest_namespace fixture  
							
							 
							
							... 
							
							
							
							This fixture can be used to inject names into the namespace in which
your doctests run. 
							
						 
						
							2016-03-02 12:43:57 +00:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								c8c5a416ef 
								
							 
						 
						
							
							
								
								Bump version to 2.10.0.dev1  
							
							 
							
							
							
						 
						
							2016-03-01 18:48:13 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								81af1c024a 
								
							 
						 
						
							
							
								
								Bump version to 2.9.1.dev1  
							
							 
							
							
							
						 
						
							2016-03-01 18:46:17 -03:00  
						
					 
				
					
						
							
							
								 
								nicoddemus
							
						 
						
							 
							
							
							
							
								
							
							
								623e786524 
								
							 
						 
						
							
							
								
								Bump version to 2.9.0  
							
							 
							
							
							
						 
						
							2016-02-29 15:39:00 -05:00  
						
					 
				
					
						
							
							
								 
								Lukas Bednar
							
						 
						
							 
							
							
							
							
								
							
							
								7e758a9dc6 
								
							 
						 
						
							
							
								
								junit: allow multiple properties with same name  
							
							 
							
							... 
							
							
							
							It might happen that test can be affected by two or more bugs.
I need to be able to track them all. 
							
						 
						
							2016-02-29 16:00:26 +01:00  
						
					 
				
					
						
							
							
								 
								Tiemo Kieft
							
						 
						
							 
							
							
							
							
								
							
							
								424b46de1b 
								
							 
						 
						
							
							
								
								Fix a typo in the docstring for mark.MarkGenerator  
							
							 
							
							
							
						 
						
							2016-02-27 14:15:42 +01:00  
						
					 
				
					
						
							
							
								 
								Florian Bruhin
							
						 
						
							 
							
							
							
							
								
							
							
								c9927bb66f 
								
							 
						 
						
							
							
								
								Merge pull request  #1414  from rygwdn/indexerror  
							
							 
							
							... 
							
							
							
							catch IndexError exceptions when getting exception source location 
							
						 
						
							2016-02-26 18:53:10 +01:00  
						
					 
				
					
						
							
							
								 
								Anatoly Bubenkov
							
						 
						
							 
							
							
							
							
								
							
							
								cf9a09e988 
								
							 
						 
						
							
							
								
								catch IndexError exceptions when getting exception source location  
							
							 
							
							
							
						 
						
							2016-02-26 08:18:12 -04:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								5f90907509 
								
							 
						 
						
							
							
								
								Fix skip/xfail markers in parametrized arguments  
							
							 
							
							... 
							
							
							
							Fix  #1412  
							
						 
						
							2016-02-25 19:13:09 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								96a331e32f 
								
							 
						 
						
							
							
								
								Display collect progress only when in a terminal  
							
							 
							
							... 
							
							
							
							Fix  #1397  
							
						 
						
							2016-02-20 14:38:30 -02:00  
						
					 
				
					
						
							
							
								 
								Dmitry Malinovsky
							
						 
						
							 
							
							
							
							
								
							
							
								e4d361b093 
								
							 
						 
						
							
							
								
								LastFailed now creates .cache only when needed.  Fixes   #1342  
							
							 
							
							
							
						 
						
							2016-02-16 11:42:04 +06:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								0eeb466f11 
								
							 
						 
						
							
							
								
								Fix strict xfail: it should behave exactly like xfail when a test fails  
							
							 
							
							
							
						 
						
							2016-02-15 19:18:48 -02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								ee88679c54 
								
							 
						 
						
							
							
								
								Fix bug in strict xfail: test was not being actually called  
							
							 
							
							
							
						 
						
							2016-02-15 18:43:45 -02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								7823838e69 
								
							 
						 
						
							
							
								
								Add strict option to xfail, making tests which XPASS to actually fail the suite  
							
							 
							
							... 
							
							
							
							Fix  #1355  
							
						 
						
							2016-02-14 20:52:27 -02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								a965386b9e 
								
							 
						 
						
							
							
								
								Add bool type to addini  
							
							 
							
							
							
						 
						
							2016-02-14 20:52:27 -02:00  
						
					 
				
					
						
							
							
								 
								Marcin Biernat
							
						 
						
							 
							
							
							
							
								
							
							
								1b431d6644 
								
							 
						 
						
							
							
								
								fix formatting utf-8 error explanation  
							
							 
							
							
							
						 
						
							2016-02-12 20:28:06 +01:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								bfa2fadac1 
								
							 
						 
						
							
							
								
								fix issue  #1366  by showing a note on the --fulltrace option  
							
							 
							
							
							
						 
						
							2016-02-10 20:27:50 +01:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								51694b8295 
								
							 
						 
						
							
							
								
								Merge branch 'master' into issue1290-at-operator  
							
							 
							
							
							
						 
						
							2016-02-06 09:31:42 -02:00  
						
					 
				
					
						
							
							
								 
								TomV
							
						 
						
							 
							
							
							
							
								
							
							
								7d107018e8 
								
							 
						 
						
							
							
								
								Fix   #1290 : Py3.5's @ operator/assertion rewriting.  
							
							 
							
							
							
						 
						
							2016-02-05 23:09:57 +00:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								de1a9f574c 
								
							 
						 
						
							
							
								
								merge from master  
							
							 
							
							
							
						 
						
							2016-02-05 00:10:28 +01:00  
						
					 
				
					
						
							
							
								 
								Georgy Dyuldin
							
						 
						
							 
							
							
							
							
								
							
							
								79722ae89b 
								
							 
						 
						
							
							
								
								Add expected exceptions to 'DID NOT RAISE' msg  
							
							 
							
							
							
						 
						
							2016-02-03 14:12:41 +03:00  
						
					 
				
					
						
							
							
								 
								Michael Aquilina
							
						 
						
							 
							
							
							
							
								
							
							
								e35ce98f89 
								
							 
						 
						
							
							
								
								Add explicit flag names for failed first and last failed  
							
							 
							
							
							
						 
						
							2016-01-27 21:28:38 +00:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								e43eaffd93 
								
							 
						 
						
							
							
								
								Remove unused import  
							
							 
							
							
							
						 
						
							2016-01-25 23:30:53 -02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								7a6f902f6f 
								
							 
						 
						
							
							
								
								Drop assertionnew and assertionold from _pytest._code  
							
							 
							
							
							
						 
						
							2016-01-25 23:18:04 -02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								a912d3745b 
								
							 
						 
						
							
							
								
								Moved py.code code over to py.test  
							
							 
							
							... 
							
							
							
							Fix  #103  
							
						 
						
							2016-01-25 23:18:04 -02:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								6c3e6401d4 
								
							 
						 
						
							
							
								
								begin 2.8.8 cycle  
							
							 
							
							
							
						 
						
							2016-01-24 23:56:56 +01:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								64d7d00218 
								
							 
						 
						
							
							
								
								Prepare 2.8.7 release  
							
							 
							
							
							
						 
						
							2016-01-24 17:59:48 +01:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								2d05f831fe 
								
							 
						 
						
							
							
								
								monkeypatch: unnest handling code  
							
							 
							
							... 
							
							
							
							this avoid python3 nested exceptions 
							
						 
						
							2016-01-24 12:28:14 +01:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								cd9e30b221 
								
							 
						 
						
							
							
								
								work around python 2/3 difference by using str(exception)  
							
							 
							
							
							
						 
						
							2016-01-24 00:40:27 +01:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								d028fe1e66 
								
							 
						 
						
							
							
								
								remove unused import  
							
							 
							
							
							
						 
						
							2016-01-23 20:29:54 +01:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								b825af2e66 
								
							 
						 
						
							
							
								
								pass trough annotated exceptions  
							
							 
							
							
							
						 
						
							2016-01-23 19:31:17 +01:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								60e9698530 
								
							 
						 
						
							
							
								
								fix issue 1338  
							
							 
							
							
							
						 
						
							2016-01-23 19:12:51 +01:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								9e6bb74d71 
								
							 
						 
						
							
							
								
								reformat monkeypatch core plugin/its tests  
							
							 
							
							
							
						 
						
							2016-01-23 19:12:51 +01:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								199fcf93d4 
								
							 
						 
						
							
							
								
								Merge branch 'master' into 'features'  
							
							 
							
							
							
						 
						
							2016-01-22 18:32:45 -02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								b7de0401b8 
								
							 
						 
						
							
							
								
								Bump version to 2.8.7.dev1  
							
							 
							
							
							
						 
						
							2016-01-22 17:59:25 -02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								82d00efa8d 
								
							 
						 
						
							
							
								
								2.8.6 release: version, CHANGELOG  
							
							 
							
							... 
							
							
							
							Remove note about expected failing envs in tox, as tox now supports
skipping certain environments based on the platform. 
							
						 
						
							2016-01-21 19:17:53 -02:00  
						
					 
				
					
						
							
							
								 
								Georgy Dyuldin
							
						 
						
							 
							
							
							
							
								
							
							
								b28b3cc271 
								
							 
						 
						
							
							
								
								Add captured stdout to jUnit report on setup error  
							
							 
							
							
							
						 
						
							2016-01-20 20:13:01 +03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								7b13c4bec0 
								
							 
						 
						
							
							
								
								Fix flakes  
							
							 
							
							
							
						 
						
							2016-01-14 21:01:57 -02:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								bc32e45bb6 
								
							 
						 
						
							
							
								
								Merge pull request  #1314  from The-Compiler/ci-verbose  
							
							 
							
							... 
							
							
							
							Always show full comparison output if on CI. 
							
						 
						
							2016-01-11 10:05:15 +01:00  
						
					 
				
					
						
							
							
								 
								Florian Bruhin
							
						 
						
							 
							
							
							
							
								
							
							
								3e5c9038ec 
								
							 
						 
						
							
							
								
								Always show full comparison output if on CI.  
							
							 
							
							... 
							
							
							
							When you don't get enough information with a test running on a CI, it's quite
frustrating, for various reasons:
- It's more likely to be a flaky test, so you might not be able to reproduce
  the failure.
- Passing -vv is quite bothersome (creating a temporary commit and reverting
  it)
For those reasons, if something goes wrong on CI, it's good to have as much
information as possible. 
							
						 
						
							2016-01-11 08:45:04 +01:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								b2c0864fbf 
								
							 
						 
						
							
							
								
								Merge pull request  #1318  from nicoddemus/doctest-unicode-error  
							
							 
							
							... 
							
							
							
							Fix decode error in Python 2.7 when docstrings contain a non-ascii character 
							
						 
						
							2016-01-11 08:37:24 +01:00  
						
					 
				
					
						
							
							
								 
								foxx
							
						 
						
							 
							
							
							
							
								
							
							
								f46de68804 
								
							 
						 
						
							
							
								
								Fixes bug with stdout/stderr capture on pdb  
							
							 
							
							
							
						 
						
							2016-01-09 12:04:26 +00:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								3c19cfcd9a 
								
							 
						 
						
							
							
								
								Fix decode error in Python 2.7 when docstrings contain a non-ascii character  
							
							 
							
							... 
							
							
							
							Fix  #628  
							
						 
						
							2016-01-08 23:10:02 -02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								b8784c28c9 
								
							 
						 
						
							
							
								
								Merge branch 'master' into 'features'  
							
							 
							
							
							
						 
						
							2016-01-08 21:51:34 -02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								369d9ecaa5 
								
							 
						 
						
							
							
								
								pytest warnings emitted during ``pytest_terminal_summary`` are now properly displayed.  
							
							 
							
							... 
							
							
							
							Fix  #1305  
							
						 
						
							2016-01-04 00:07:45 -02:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								6c170201d6 
								
							 
						 
						
							
							
								
								Merge branch 'master' into features  
							
							 
							
							
							
						 
						
							2016-01-02 23:56:01 +01:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								bf4de4bd68 
								
							 
						 
						
							
							
								
								Merge pull request  #1294  from nicoddemus/doctest-bytes-literals  
							
							 
							
							... 
							
							
							
							Doctest bytes literals 
							
						 
						
							2016-01-01 18:18:08 +01:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								1bdf71730a 
								
							 
						 
						
							
							
								
								Complement  #1255  by adding tests and docs  
							
							 
							
							... 
							
							
							
							Fix  #1242  
							
						 
						
							2015-12-30 18:24:59 -02:00  
						
					 
				
					
						
							
							
								 
								jab
							
						 
						
							 
							
							
							
							
								
							
							
								0ea8dc0d40 
								
							 
						 
						
							
							
								
								make --doctest-glob multi-allowed  
							
							 
							
							
							
						 
						
							2015-12-30 17:32:14 -02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								638b3f5e39 
								
							 
						 
						
							
							
								
								Make monkeypatch calls O(1)  
							
							 
							
							... 
							
							
							
							Fix  #1292  
							
						 
						
							2015-12-29 22:04:35 -02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								a0edbb75a4 
								
							 
						 
						
							
							
								
								Implement ALLOW_BYTES doctest option  
							
							 
							
							... 
							
							
							
							Fix  #1287  
							
						 
						
							2015-12-29 20:55:19 -02:00  
						
					 
				
					
						
							
							
								 
								Ulrich Petri
							
						 
						
							 
							
							
							
							
								
							
							
								8d49abb0d1 
								
							 
						 
						
							
							
								
								Make monkeypatch differentiate ImportError sources  
							
							 
							
							... 
							
							
							
							Previously `monkeypatch` assumed that any `ImportError` was caused by
a mistake in the specified import path. However this assumption is false 
in case the import target itself causes an `ImportError`.
Fixes : #900  
							
						 
						
							2015-12-27 22:44:23 +01:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								5afb61ad26 
								
							 
						 
						
							
							
								
								Fix trailing white-space  
							
							 
							
							
							
						 
						
							2015-12-25 17:51:55 -02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								57bc14caa0 
								
							 
						 
						
							
							
								
								Apply readline workaround during initial conftest loading  
							
							 
							
							
							
						 
						
							2015-12-25 17:46:19 -02:00  
						
					 
				
					
						
							
							
								 
								Erik M. Bray
							
						 
						
							 
							
							
							
							
								
							
							
								6e170a4a1c 
								
							 
						 
						
							
							
								
								* Moved workaround to its own function, mostly for the sake of adding  
							
							 
							
							... 
							
							
							
							a more descriptive docstring (the workaround itself is just to import
  readline earlier).  I removed the conditional on targetfd from the
  workaround since it doesn't really matter.
* Added # noqa marker.
* Added changelog entry, and self to authors. 
							
						 
						
							2015-12-24 16:43:34 -05:00  
						
					 
				
					
						
							
							
								 
								Erik M. Bray
							
						 
						
							 
							
							
							
							
								
							
							
								924a9667e1 
								
							 
						 
						
							
							
								
								Make sure readline has been imported before duping any stdio handles--otherwise pyreadline fails to connect to the correct handle for the console's stdout/in.  
							
							 
							
							
							
						 
						
							2015-12-24 14:56:57 -05:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								943099ddd1 
								
							 
						 
						
							
							
								
								Merge newinterpret into reinterpret.py  
							
							 
							
							
							
						 
						
							2015-12-16 18:31:43 -02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								81588d7f63 
								
							 
						 
						
							
							
								
								Remove obsolete "oldinterpret" module  
							
							 
							
							
							
						 
						
							2015-12-16 16:16:22 -02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								af893aab26 
								
							 
						 
						
							
							
								
								Remove code related to support python <= 2.5  
							
							 
							
							... 
							
							
							
							Fix  #1226  
							
						 
						
							2015-12-16 16:16:22 -02:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								8bf7e7cc4b 
								
							 
						 
						
							
							
								
								fixes   #1259  - take finalized nodes out of the mapping  
							
							 
							
							... 
							
							
							
							this allows double node id usage for file based items 
							
						 
						
							2015-12-16 19:09:44 +01:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								2b2bec6b97 
								
							 
						 
						
							
							
								
								Remove experimental status from pytest_exception_interact  
							
							 
							
							
							
						 
						
							2015-12-16 14:29:39 -02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								6ac31088c5 
								
							 
						 
						
							
							
								
								Merge branch 'master' into merge-master-into-features  
							
							 
							
							
							
						 
						
							2015-12-11 23:13:50 -02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								e87facfb22 
								
							 
						 
						
							
							
								
								Bump master to 2.8.6.dev1  
							
							 
							
							
							
						 
						
							2015-12-11 23:07:30 -02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								a124163425 
								
							 
						 
						
							
							
								
								Prepare for 2.8.5: bump version, CHANGELOG, announce  
							
							 
							
							
							
						 
						
							2015-12-11 19:20:07 -02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								86b6ce5042 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into merge-master-into-features  
							
							 
							
							
							
						 
						
							2015-12-10 19:41:14 -02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								8b61a332ba 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'bukzor/features-merge-master' into features  
							
							 
							
							
							
						 
						
							2015-12-10 19:03:55 -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  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								1c46462991 
								
							 
						 
						
							
							
								
								Fix deprecated_call regression introduced in 2.8.4  
							
							 
							
							... 
							
							
							
							Fix  #1238  
							
						 
						
							2015-12-08 22:40:05 -02:00  
						
					 
				
					
						
							
							
								 
								Buck Golemon
							
						 
						
							 
							
							
							
							
								
							
							
								eabf2f9091 
								
							 
						 
						
							
							
								
								Merge branch 'master' into features  
							
							 
							
							... 
							
							
							
							Conflicts:
	AUTHORS
	_pytest/__init__.py
	_pytest/hookspec.py
	_pytest/recwarn.py
	testing/test_recwarn.py 
							
						 
						
							2015-12-07 14:28:59 -08:00  
						
					 
				
					
						
							
							
								 
								David Vierra
							
						 
						
							 
							
							
							
							
								
							
							
								fbac936596 
								
							 
						 
						
							
							
								
								Add -rp and -rP options to report passing tests.  
							
							 
							
							... 
							
							
							
							-rP is an alternative to `-s` for viewing the output of passing tests.
This causes the captured stdout/stderr of passing tests to be output in
the same way as that of failing tests.
-rp adds a simple one-line-per-test summary for passing tests.
Neither option is included by -ra.
Additional changes to `pytest_capturelog` and `pytest_catchlog` are
needed for this option to also output captured logs: They must be
changed to use `rep.sections.add` instead of `rep.longrepr.addsection`,
and to add these additional sections even if the test passes, since
passing tests don't seem to have a `longrepr` at report time. 
							
						 
						
							2015-12-07 11:32:56 -10:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								7b7737bf96 
								
							 
						 
						
							
							
								
								handle duplicate test ids via collection and xdist each reporting  
							
							 
							
							
							
						 
						
							2015-12-07 21:54:25 +01:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								9ea7826427 
								
							 
						 
						
							
							
								
								Junitxml: correct node reporter attribute names  
							
							 
							
							
							
						 
						
							2015-12-07 21:54:25 +01:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								09cc45b0c5 
								
							 
						 
						
							
							
								
								junitxml: correct docstring of make_properties_node  
							
							 
							
							
							
						 
						
							2015-12-07 21:54:25 +01:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								0aa54101c9 
								
							 
						 
						
							
							
								
								junitxml: follow Bruno's attribute/method naming hint from the review  
							
							 
							
							
							
						 
						
							2015-12-07 21:54:25 +01:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								518c88f149 
								
							 
						 
						
							
							
								
								finalize nodereporters by throwing away the intermediate xml nodes, fixes issue  #1074  
							
							 
							
							
							
						 
						
							2015-12-07 21:54:25 +01:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								5f5a7995b9 
								
							 
						 
						
							
							
								
								reintroduce junitxml report order and debug cleanups  
							
							 
							
							
							
						 
						
							2015-12-07 21:54:24 +01:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								0528e5b45f 
								
							 
						 
						
							
							
								
								junitxml: intermediate, move testcase generation to NodeReporter  
							
							 
							
							
							
						 
						
							2015-12-07 21:54:24 +01:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								9b04958303 
								
							 
						 
						
							
							
								
								junitxml: keep track of custom property insert order  
							
							 
							
							... 
							
							
							
							+ review: should we allow the same key multile times 
							
						 
						
							2015-12-07 21:54:24 +01:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								faed54d6c7 
								
							 
						 
						
							
							
								
								junitxml: use node.warn to ensure fslocations  
							
							 
							
							
							
						 
						
							2015-12-07 21:54:24 +01:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								1f609f96e6 
								
							 
						 
						
							
							
								
								junitxml: introduce nodereporter and track durations/properties there  
							
							 
							
							
							
						 
						
							2015-12-07 21:54:24 +01:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								0664ae137c 
								
							 
						 
						
							
							
								
								junitxml: remove debug print  
							
							 
							
							
							
						 
						
							2015-12-07 21:54:24 +01:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								d0107c898e 
								
							 
						 
						
							
							
								
								junitxml restrucutre stat generation - use node tags  
							
							 
							
							
							
						 
						
							2015-12-07 21:54:24 +01:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								2a31df072b 
								
							 
						 
						
							
							
								
								junitxml: reverse the if/else logic for failure appending  
							
							 
							
							
							
						 
						
							2015-12-07 21:54:24 +01:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								02f5defd89 
								
							 
						 
						
							
							
								
								yapf junitxml  
							
							 
							
							
							
						 
						
							2015-12-07 21:54:24 +01:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								c727860241 
								
							 
						 
						
							
							
								
								bump to 2.8.5.dev  
							
							 
							
							
							
						 
						
							2015-12-06 20:31:14 +01:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								a3353c49fd 
								
							 
						 
						
							
							
								
								prepare release 2.8.4 - changelog updates + version bump  
							
							 
							
							
							
						 
						
							2015-12-06 16:13:55 +01:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								14bc3c4009 
								
							 
						 
						
							
							
								
								Fix pastebin when captured output contains non-ascii characters  
							
							 
							
							... 
							
							
							
							Fix  #1219  
							
						 
						
							2015-12-03 20:07:18 -02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								a54e4e64cd 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into pastebin-py3  
							
							 
							
							
							
						 
						
							2015-12-01 23:51:14 -02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								6a2ebddc7c 
								
							 
						 
						
							
							
								
								Decode urlopen response in pastebin  
							
							 
							
							... 
							
							
							
							Fix  #1198  
							
						 
						
							2015-12-01 23:33:37 -02:00  
						
					 
				
					
						
							
							
								 
								Jeff Widman
							
						 
						
							 
							
							
							
							
								
							
							
								6be6798cdf 
								
							 
						 
						
							
							
								
								Fix spelling: explicitely --> explicitly  
							
							 
							
							
							
						 
						
							2015-12-01 01:41:47 -08:00  
						
					 
				
					
						
							
							
								 
								Florian Bruhin
							
						 
						
							 
							
							
							
							
								
							
							
								0d2668017d 
								
							 
						 
						
							
							
								
								Fix spelling mistake in  #1207 .  
							
							 
							
							
							
						 
						
							2015-11-30 17:33:34 +01:00  
						
					 
				
					
						
							
							
								 
								Florian Bruhin
							
						 
						
							 
							
							
							
							
								
							
							
								aba55a0fb2 
								
							 
						 
						
							
							
								
								Fix terminal output if no tests were run.  
							
							 
							
							... 
							
							
							
							Before:
====  in 0.00 seconds ====
After:
==== no tests run in 0.00 seconds ==== 
							
						 
						
							2015-11-30 17:24:40 +01: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  
						
					 
				
					
						
							
							
								 
								mehdy
							
						 
						
							 
							
							
							
							
								
							
							
								81ad1689b9 
								
							 
						 
						
							
							
								
								fix   #1198  - removed docoding the result  
							
							 
							
							
							
						 
						
							2015-11-29 19:20:37 +03:30  
						
					 
				
					
						
							
							
								 
								mehdy
							
						 
						
							 
							
							
							
							
								
							
							
								44f60ba141 
								
							 
						 
						
							
							
								
								fixed   #1198  issue by encoding the unicode parameters to bytes and decoding the  
							
							 
							
							... 
							
							
							
							bytes response to unicode 
							
						 
						
							2015-11-29 18:27:05 +03:30  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								603d81ef2f 
								
							 
						 
						
							
							
								
								deprecated_call now uses monkey patching strategy to capture warnings  
							
							 
							
							... 
							
							
							
							similar to what we had in 2.7, with a few enhancements
Fix  #1190  
							
						 
						
							2015-11-26 16:48:58 -02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								6378cdf7a9 
								
							 
						 
						
							
							
								
								Restored 2.7 implentation of deprecated_call  
							
							 
							
							
							
						 
						
							2015-11-26 15:54:57 -02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								b20803f0a6 
								
							 
						 
						
							
							
								
								Mention pytest_enter_pdb in the docs  
							
							 
							
							
							
						 
						
							2015-11-23 18:00:02 -02:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								df767cca8f 
								
							 
						 
						
							
							
								
								Merge pull request  #1188  from nicoddemus/pytest_enter_pdb  
							
							 
							
							... 
							
							
							
							Pass pytest config object to pytest_enter_pdb 
							
						 
						
							2015-11-23 20:55:33 +01:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								b3166a538c 
								
							 
						 
						
							
							
								
								Pass pytest's config object to pytest_enter_pdb  
							
							 
							
							
							
						 
						
							2015-11-23 14:42:21 -02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								1f148a93ec 
								
							 
						 
						
							
							
								
								Mention pytest_enter_pdb in the docs  
							
							 
							
							
							
						 
						
							2015-11-23 13:02:15 -02:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								af46ffe021 
								
							 
						 
						
							
							
								
								bump to 2.8.4.dev  
							
							 
							
							
							
						 
						
							2015-11-19 22:01:34 +01:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								3dc57d99f2 
								
							 
						 
						
							
							
								
								Changelog groming and release preps for 2.8.3  
							
							 
							
							
							
						 
						
							2015-11-18 17:34:30 +01:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								7d6edb9ca5 
								
							 
						 
						
							
							
								
								Fix unittest.skip decorator test and separate the fix into a different, self-doc function  
							
							 
							
							
							
						 
						
							2015-11-04 19:54:18 -02:00  
						
					 
				
					
						
							
							
								 
								Lee Kamentsky
							
						 
						
							 
							
							
							
							
								
							
							
								313050b15b 
								
							 
						 
						
							
							
								
								Suggested edits by Bruno.  
							
							 
							
							... 
							
							
							
							Moved fix to TestCaseFunction.setup. Added myself to AUTHORS and added entry to CHANGELOG 
							
						 
						
							2015-11-04 15:30:16 -05:00  
						
					 
				
					
						
							
							
								 
								LeeKamentsky
							
						 
						
							 
							
							
							
							
								
							
							
								8de2c035e2 
								
							 
						 
						
							
							
								
								Fixes   #1169  
							
							 
							
							... 
							
							
							
							The unittest.skip decorator runs @functools.wraps on self._testcase. functools.wraps expects a "__name__" attribute and this patch adds one. It might not be the correct fix, but it works for me. 
							
						 
						
							2015-11-04 13:52:40 -05:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								9013cb1b4c 
								
							 
						 
						
							
							
								
								Merge pull request  #1144  from The-Compiler/elcapitan-sip  
							
							 
							
							... 
							
							
							
							Handle EPERM when writing rewritten bytecode. 
							
						 
						
							2015-11-01 08:20:00 +01:00  
						
					 
				
					
						
							
							
								 
								Gabriel Reis
							
						 
						
							 
							
							
							
							
								
							
							
								f3f61fb5d1 
								
							 
						 
						
							
							
								
								Color highlight on the name of the failed tests  
							
							 
							
							
							
						 
						
							2015-10-28 08:12:57 +00:00  
						
					 
				
					
						
							
							
								 
								John Vandenberg
							
						 
						
							 
							
							
							
							
								
							
							
								9a04879129 
								
							 
						 
						
							
							
								
								Remove commented out extrainit  
							
							 
							
							... 
							
							
							
							Unused since 2012, and the docstring syntax is incorrect with
four quotes. 
							
						 
						
							2015-10-20 21:08:21 +11:00  
						
					 
				
					
						
							
							
								 
								Florian Bruhin
							
						 
						
							 
							
							
							
							
								
							
							
								2956627b8b 
								
							 
						 
						
							
							
								
								Handle EPERM when writing rewritten bytecode.  
							
							 
							
							... 
							
							
							
							Fixes  #1143 . 
							
						 
						
							2015-10-17 11:55:55 +02: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