b9a91dc112 
								
							 
						 
						
							
							
								
								merge from master to features  
							
							
							
						 
						
							2016-07-06 11:51:48 +02:00  
				
					
						
							
							
								 
						
							
								58e558141d 
								
							 
						 
						
							
							
								
								Remove commented out code  
							
							
							
						 
						
							2016-06-26 21:19:07 +02:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								0e2ebc96ff 
								
							 
						 
						
							
							
								
								Remove deprecated cmd options  
							
							... 
							
							
							
							Fixes  #1657  
						
							2016-06-26 19:26:04 +02:00  
				
					
						
							
							
								 
						
							
								c17027e576 
								
							 
						 
						
							
							
								
								Warn about asserts on tuples ( fixes   #1562 )  
							
							
							
						 
						
							2016-06-25 19:21:48 +02:00  
				
					
						
							
							
								 
						
							
								e2f550156e 
								
							 
						 
						
							
							
								
								Improve of the test output for logical expression with brackets.  
							
							... 
							
							
							
							Fixes  #925  
						
							2016-06-25 18:10:36 +02:00  
				
					
						
							
							
								 
						
							
								77689eb486 
								
							 
						 
						
							
							
								
								Fixes   #1503  no longer collapse false explanations  
							
							
							
						 
						
							2016-06-24 15:35:24 +02:00  
				
					
						
							
							
								 
						
							
								18ef7de96b 
								
							 
						 
						
							
							
								
								merge from master again  
							
							
							
						 
						
							2016-06-22 16:03:52 +02:00  
				
					
						
							
							
								 
						
							
								98adf204b2 
								
							 
						 
						
							
							
								
								issue 1553: Include terminal newlines in diffs  
							
							
							
						 
						
							2016-06-22 09:50:15 +02:00  
				
					
						
							
							
								 
						
							
								819942e964 
								
							 
						 
						
							
							
								
								Return explicit None from rewrite hook's find_module  
							
							
							
						 
						
							2016-06-21 12:28:36 +02:00  
				
					
						
							
							
								 
						
							
								8b0fb47c79 
								
							 
						 
						
							
							
								
								Remove print left by accident  
							
							
							
						 
						
							2016-06-21 12:23:12 +02:00  
				
					
						
							
							
								 
						
							
								9118c0222f 
								
							 
						 
						
							
							
								
								Merge .set_config() into constructor  
							
							
							
						 
						
							2016-06-21 09:28:10 +02:00  
				
					
						
							
							
								 
						
							
								3a81d2e012 
								
							 
						 
						
							
							
								
								conftest files now use assertion rewriting  
							
							... 
							
							
							
							Fix  #1619  
						
							2016-06-20 23:13:29 +02:00  
				
					
						
							
							
								 
						
							
								1b431d6644 
								
							 
						 
						
							
							
								
								fix formatting utf-8 error explanation  
							
							
							
						 
						
							2016-02-12 20:28:06 +01:00  
				
					
						
							
							
								 
						
							
								51694b8295 
								
							 
						 
						
							
							
								
								Merge branch 'master' into issue1290-at-operator  
							
							
							
						 
						
							2016-02-06 09:31:42 -02:00  
				
					
						
							
							
								 
						
							
								7d107018e8 
								
							 
						 
						
							
							
								
								Fix   #1290 : Py3.5's @ operator/assertion rewriting.  
							
							
							
						 
						
							2016-02-05 23:09:57 +00:00  
				
					
						
							
							
								 
						
							
								a912d3745b 
								
							 
						 
						
							
							
								
								Moved py.code code over to py.test  
							
							... 
							
							
							
							Fix  #103  
						
							2016-01-25 23:18:04 -02:00  
				
					
						
							
							
								 
						
							
								199fcf93d4 
								
							 
						 
						
							
							
								
								Merge branch 'master' into 'features'  
							
							
							
						 
						
							2016-01-22 18:32:45 -02:00  
				
					
						
							
							
								 
						
							
								7b13c4bec0 
								
							 
						 
						
							
							
								
								Fix flakes  
							
							
							
						 
						
							2016-01-14 21:01:57 -02:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								943099ddd1 
								
							 
						 
						
							
							
								
								Merge newinterpret into reinterpret.py  
							
							
							
						 
						
							2015-12-16 18:31:43 -02:00  
				
					
						
							
							
								 
						
							
								81588d7f63 
								
							 
						 
						
							
							
								
								Remove obsolete "oldinterpret" module  
							
							
							
						 
						
							2015-12-16 16:16:22 -02:00  
				
					
						
							
							
								 
						
							
								2956627b8b 
								
							 
						 
						
							
							
								
								Handle EPERM when writing rewritten bytecode.  
							
							... 
							
							
							
							Fixes  #1143 . 
						
							2015-10-17 11:55:55 +02:00  
				
					
						
							
							
								 
						
							
								7658f60146 
								
							 
						 
						
							
							
								
								#877  - reencoding causes typeerrors on python2  
							
							
							
						 
						
							2015-09-19 00:30:01 +02:00  
				
					
						
							
							
								 
						
							
								49c99a41ea 
								
							 
						 
						
							
							
								
								reencode non-ascii python2 assertion reprs,  fixes   #877  
							
							... 
							
							
							
							i decided against using a warning since the problem goes away with python3
the support code can be removed once we drop python2 in 10 years or so 
							
						 
						
							2015-09-19 00:30:01 +02:00  
				
					
						
							
							
								 
						
							
								dd7112d5ea 
								
							 
						 
						
							
							
								
								Show a few diff lines when truncating string diffs  
							
							... 
							
							
							
							Fix  #934  
						
							2015-08-27 22:20:13 -03:00  
				
					
						
							
							
								 
						
							
								4462b83258 
								
							 
						 
						
							
							
								
								Style fix  
							
							
							
						 
						
							2015-07-16 11:04:36 -07:00  
				
					
						
							
							
								 
						
							
								195422f9c0 
								
							 
						 
						
							
							
								
								Fix AST rewriting with starred expressions in function calls  
							
							
							
						 
						
							2015-07-15 15:31:35 -07:00  
				
					
						
							
							
								 
						
							
								35bea86c9f 
								
							 
						 
						
							
							
								
								No Starred node type on Python 2  
							
							
							
						 
						
							2015-07-15 14:11:21 -07:00  
				
					
						
							
							
								 
						
							
								d774f3ca86 
								
							 
						 
						
							
							
								
								generify  
							
							
							
						 
						
							2015-07-15 13:49:40 -07:00  
				
					
						
							
							
								 
						
							
								167625d24d 
								
							 
						 
						
							
							
								
								simplify + fix  
							
							
							
						 
						
							2015-07-15 13:49:40 -07:00  
				
					
						
							
							
								 
						
							
								3bc6c0f936 
								
							 
						 
						
							
							
								
								a test  
							
							
							
						 
						
							2015-07-15 13:49:40 -07:00  
				
					
						
							
							
								 
						
							
								26e64fc45c 
								
							 
						 
						
							
							
								
								Ast Call signature changed on 3.5  
							
							... 
							
							
							
							fix issue 744 on bitbucket
port of merge request 296
https://bitbucket.org/pytest-dev/pytest/pull-request/296/astcall-signature-changed-on-35 
https://bitbucket.org/pytest-dev/pytest/issue/744/  
							
						 
						
							2015-07-15 13:49:40 -07:00  
				
					
						
							
							
								 
						
							
								7445c5bd70 
								
							 
						 
						
							
							
								
								Add support for PEP302 get_data API  
							
							... 
							
							
							
							Fix  #808  
						
							2015-07-11 14:13:43 -03:00  
				
					
						
							
							
								 
						
							
								ee40ea5f6d 
								
							 
						 
						
							
							
								
								Merge branch 'pytest-2.7'  
							
							... 
							
							
							
							Conflicts:
	AUTHORS
	_pytest/__init__.py
	setup.py
	testing/conftest.py
	tox.ini 
							
						 
						
							2015-06-23 16:49:05 +02:00  
				
					
						
							
							
								 
						
							
								48d91def7e 
								
							 
						 
						
							
							
								
								Added workaround to still show the diff on containers with unsortable elements.  
							
							... 
							
							
							
							fix issue #718  
							
						 
						
							2015-06-19 07:51:59 -03:00  
				
					
						
							
							
								 
						
							
								ca44e88e54 
								
							 
						 
						
							
							
								
								backport fixed issue735  
							
							... 
							
							
							
							--HG--
branch : pytest-2.7 
							
						 
						
							2015-06-04 07:52:25 +02:00  
				
					
						
							
							
								 
						
							
								f3ad2e4ad2 
								
							 
						 
						
							
							
								
								use NameConstant node when it exists ( fixes   #735 )  
							
							... 
							
							
							
							--HG--
branch : issue735 
							
						 
						
							2015-06-03 18:07:10 -05:00  
				
					
						
							
							
								 
						
							
								aa2ffb9805 
								
							 
						 
						
							
							
								
								Merge fix for issue 731 from pytest-2.7  
							
							
							
						 
						
							2015-04-30 21:13:03 +01:00  
				
					
						
							
							
								 
						
							
								7f554f50e3 
								
							 
						 
						
							
							
								
								Fix collapse false to look at unescaped braces only  
							
							... 
							
							
							
							Sometimes the repr of an object can contain the "\n{" sequence which is
used as a formatting language, so they are escaped to "\\n{".  But the
collapse-false code needs to look for the real "\n{" token instead of
simply "{" as otherwise it may get unbalanced braces from the object's
repr (sometimes caused by the collapsing of long reprs by saferepr).
Fixes issue #731 .
--HG--
branch : pytest-2.7 
							
						 
						
							2015-04-30 02:31:12 +01:00  
				
					
						
							
							
								 
						
							
								715a235b45 
								
							 
						 
						
							
							
								
								remove shutdown logic from PluginManager and add a add_cleanup() API  
							
							... 
							
							
							
							for the already existing cleanup logic of the config object.
This simplifies lifecycle management as we don't keep two
layers of shutdown functions and also simplifies the pluginmanager
interface.
also add some docstrings.
--HG--
branch : plugin_no_pytest 
							
						 
						
							2015-04-22 16:33:20 +02:00  
				
					
						
							
							
								 
						
							
								c629f6b18b 
								
							 
						 
						
							
							
								
								Fix `reload()` with modules handled via `python_files`  
							
							... 
							
							
							
							If a module exists in `sys.modules` already, `load_module` has to return it.
Fixes https://bitbucket.org/pytest-dev/pytest/issue/435 
--HG--
branch : fix-reload 
							
						 
						
							2015-03-04 16:21:27 +01:00  
				
					
						
							
							
								 
						
							
								f6caf230f8 
								
							 
						 
						
							
							
								
								fix for issue615: _format_boolop must escape %  
							
							... 
							
							
							
							fix test for issue615: expression must eval False
--HG--
branch : format_boolop_percent6 
							
						 
						
							2014-10-27 08:57:58 +00:00  
				
					
						
							
							
								 
						
							
								7371d436d2 
								
							 
						 
						
							
							
								
								Fix assertion.rewrite on read-only filesystem  
							
							
							
						 
						
							2014-10-17 21:18:37 +01:00  
				
					
						
							
							
								 
						
							
								857db415bc 
								
							 
						 
						
							
							
								
								fix some spelling mistakes  
							
							... 
							
							
							
							--HG--
branch : some_spelling_fixes 
							
						 
						
							2014-10-13 23:16:26 +01:00  
				
					
						
							
							
								 
						
							
								a759da0208 
								
							 
						 
						
							
							
								
								Escape % character in the assertion message.  closes   #604  
							
							
							
						 
						
							2014-10-07 01:01:21 +02:00  
				
					
						
							
							
								 
						
							
								9a0f2a9fb7 
								
							 
						 
						
							
							
								
								Improve assertion failure reporting on iterables, by using ndiff and pprint.  
							
							
							
						 
						
							2014-09-27 01:29:47 +00:00  
				
					
						
							
							
								 
						
							
								79d2edcbff 
								
							 
						 
						
							
							
								
								Merged in flub/pytest (pull request  #207 )  
							
							... 
							
							
							
							Show both user assertion msg as explanation (issue549) 
							
						 
						
							2014-09-22 19:16:10 +02:00  
				
					
						
							
							
								 
						
							
								a8dfe34bfb 
								
							 
						 
						
							
							
								
								Merged in uweschmitt/pytest/default (pull request  #194 )  
							
							
							
						 
						
							2014-09-05 23:57:18 +01:00  
				
					
						
							
							
								 
						
							
								7d9d502a01 
								
							 
						 
						
							
							
								
								Use py3k compatible .__getattr__() code  
							
							... 
							
							
							
							From the python-dev thread it seemed like using
object.__getattribute__(self, 'name') is the cleanest way of
implementing a class wich uses .__getattr__() and should be
pickelable.  That only works on new-style classes so this also turns
HookProxy into a new-style class on py2.
This also re-writes the test to not use cPickle so it runs on py3k. 
							
						 
						
							2014-09-05 23:55:14 +01:00