1e0cf5ce4d 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into merge-master-into-features  
							
							... 
							
							
							
							# Conflicts:
#	AUTHORS
#	CHANGELOG.rst
#	_pytest/pytester.py 
							
						 
						
							2017-03-10 15:54:05 -03:00  
				
					
						
							
							
								 
						
							
								6ba3475448 
								
							 
						 
						
							
							
								
								Make capsys more like stdio streams in python3.   Resolves   #1407 .  
							
							
							
						 
						
							2017-02-23 17:46:27 -08:00  
				
					
						
							
							
								 
						
							
								fb0b90646e 
								
							 
						 
						
							
							
								
								New-style classes implemented for python 2.7 -  #2147  
							
							
							
						 
						
							2017-02-16 20:28:17 +01:00  
				
					
						
							
							
								 
						
							
								ede4e9171f 
								
							 
						 
						
							
							
								
								Spelling fixes  
							
							
							
						 
						
							2017-02-15 17:00:58 +02:00  
				
					
						
							
							
								 
						
							
								a152ea2dbb 
								
							 
						 
						
							
							
								
								Add buffer attribute to stdin stub  
							
							
							
						 
						
							2016-08-24 16:26:34 -07:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								e9a67e6702 
								
							 
						 
						
							
							
								
								Adjust test involving FixtureLookupErrorRepr  
							
							... 
							
							
							
							I added a starting 'E' to the expected error messages.
The tests were still passing after the previous patch but I think it's
better to have stricter tests. 
							
						 
						
							2016-07-23 23:45:07 +02:00  
				
					
						
							
							
								 
						
							
								0dd1c8bf14 
								
							 
						 
						
							
							
								
								Add test to ensure capsys and capfd error out when using "getfixturevalue" inside a test  
							
							
							
						 
						
							2016-07-11 20:48:38 -03:00  
				
					
						
							
							
								 
						
							
								72bf11cbe9 
								
							 
						 
						
							
							
								
								Add disabled() method to capsys and capfd  
							
							... 
							
							
							
							Fix  #1599  
						
							2016-06-19 19:14:36 +02:00  
				
					
						
							
							
								 
						
							
								a912d3745b 
								
							 
						 
						
							
							
								
								Moved py.code code over to py.test  
							
							... 
							
							
							
							Fix  #103  
						
							2016-01-25 23:18:04 -02:00  
				
					
						
							
							
								 
						
							
								4e94135d36 
								
							 
						 
						
							
							
								
								Remove incorrect use of pytest.mark.skip  
							
							
							
						 
						
							2015-10-03 16:42:14 +01:00  
				
					
						
							
							
								 
						
							
								2ffd37b816 
								
							 
						 
						
							
							
								
								return non-zero exit code if no tests are collected  
							
							... 
							
							
							
							Fix  #812 
Fix  #500  
						
							2015-08-18 07:35:02 -03:00  
				
					
						
							
							
								 
						
							
								e68fa641ff 
								
							 
						 
						
							
							
								
								Merge reset-capgture-on-reeadouterr-errors  
							
							... 
							
							
							
							Merge branch 'reset-capture-on-readouterr-errors' of github.com:davidszotten/pytest into merge-capmerge 
							
						 
						
							2015-07-26 11:39:03 +02:00  
				
					
						
							
							
								 
						
							
								3e6bee2fc6 
								
							 
						 
						
							
							
								
								fail if snap is removed in the future  
							
							
							
						 
						
							2015-07-26 01:28:00 +02:00  
				
					
						
							
							
								 
						
							
								983d249680 
								
							 
						 
						
							
							
								
								reset capture even if readouterr throws  
							
							... 
							
							
							
							otherwise that exception (and all following output) end up in /dev/null 
							
						 
						
							2015-07-26 01:15:51 +02:00  
				
					
						
							
							
								 
						
							
								033def0a7a 
								
							 
						 
						
							
							
								
								Workaround for cmdexec bug on Windows  
							
							... 
							
							
							
							This bug fails the entire pytest suite when executed with the
--lsof option in Python 2 on Windows. 
							
						 
						
							2015-07-24 19:24:31 -03:00  
				
					
						
							
							
								 
						
							
								9f94e443ff 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/pytest-2.7'  
							
							... 
							
							
							
							Conflicts:
	testing/conftest.py 
							
						 
						
							2015-07-24 19:24:21 -03:00  
				
					
						
							
							
								 
						
							
								4f1ae8c45e 
								
							 
						 
						
							
							
								
								Workaround for cmdexec bug on Windows  
							
							... 
							
							
							
							This bug fails the entire pytest suite when executed with the
--lsof option in Python 2 on Windows. 
							
						 
						
							2015-07-24 18:05:30 -03:00  
				
					
						
							
							
								 
						
							
								db5649ec6a 
								
							 
						 
						
							
							
								
								streamline pytester API majorly:  
							
							... 
							
							
							
							- integrate conftest into pytester plugin
- introduce runpytest() to either call runpytest_inline (default) or
  runpytest_subprocess (python -m pytest)
- move testdir.inline_runsource1 to pdb tests
- strike some unneccessary methods.
- a new section "writing plugins" and some better pytester docs
--HG--
branch : testrefactor 
							
						 
						
							2015-04-28 11:54:53 +02:00  
				
					
						
							
							
								 
						
							
								a8afba054a 
								
							 
						 
						
							
							
								
								- refine lsof checking  
							
							... 
							
							
							
							- make runpytest() create an inline testing process instead of
  a subprocess one
--HG--
branch : testrefactor 
							
						 
						
							2015-04-28 11:54:46 +02:00  
				
					
						
							
							
								 
						
							
								c3ca44b46f 
								
							 
						 
						
							
							
								
								change links to go to the new pytest-dev bitbucket team's repo location  
							
							... 
							
							
							
							--HG--
branch : docs_community 
							
						 
						
							2015-02-27 12:27:40 +01:00  
				
					
						
							
							
								 
						
							
								35eec99d41 
								
							 
						 
						
							
							
								
								stop leaking file descriptors  
							
							... 
							
							
							
							tripps --lsof on os x but not on linux. there's possibly a bug in the leak
detector (not investigated here)
--HG--
branch : stop_leaking_fds 
							
						 
						
							2014-09-22 13:56:07 +01:00  
				
					
						
							
							
								 
						
							
								bc4eecbbac 
								
							 
						 
						
							
							
								
								add `encoding` attr to DontReadFromInput  
							
							... 
							
							
							
							required by https://docs.python.org/2/library/stdtypes.html#file.encoding 
and used e.g. by ipdb at _import_ time
--HG--
branch : dontreadfrominput-encoding 
							
						 
						
							2014-09-22 12:19:27 +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  
				
					
						
							
							
								 
						
							
								d1bde69c1e 
								
							 
						 
						
							
							
								
								added smoke test for bug fixed in 3716:dc080608b6d1  
							
							
							
						 
						
							2014-08-19 12:57:37 +02:00  
				
					
						
							
							
								 
						
							
								1d7b574b31 
								
							 
						 
						
							
							
								
								fix issue555: just add "errors" attribute to internal Capture stream.  
							
							
							
						 
						
							2014-08-07 11:05:42 +02:00  
				
					
						
							
							
								 
						
							
								1265612465 
								
							 
						 
						
							
							
								
								fix issue547 2.6 regression: capsys/capfd now work again when output capturing ("-s") is disabled.  
							
							
							
						 
						
							2014-07-28 13:17:37 +02:00  
				
					
						
							
							
								 
						
							
								54c88a6cf3 
								
							 
						 
						
							
							
								
								fix flakes issues  
							
							
							
						 
						
							2014-06-16 11:27:32 +02:00  
				
					
						
							
							
								 
						
							
								e6859406f1 
								
							 
						 
						
							
							
								
								fix test on py33, thanks msabramo1  
							
							
							
						 
						
							2014-04-02 20:49:57 +02:00  
				
					
						
							
							
								 
						
							
								68e58e1493 
								
							 
						 
						
							
							
								
								add a test for robustness of capturing when a test closes FD1/2  
							
							
							
						 
						
							2014-04-02 20:29:10 +02:00  
				
					
						
							
							
								 
						
							
								2c0f6207e9 
								
							 
						 
						
							
							
								
								test_capture.py: More PEP8. Remove unused `cap` in `with`.  
							
							... 
							
							
							
							--HG--
branch : remove_unused_import 
							
						 
						
							2014-04-02 09:48:08 -07:00  
				
					
						
							
							
								 
						
							
								02d94e69f0 
								
							 
						 
						
							
							
								
								testing/test_capture.py: Remove unused `import tempfile`  
							
							... 
							
							
							
							--HG--
branch : remove_unused_import 
							
						 
						
							2014-04-02 09:14:16 -07:00  
				
					
						
							
							
								 
						
							
								0c04b44919 
								
							 
						 
						
							
							
								
								fix issue492: avoid leak in test_writeorg  
							
							
							
						 
						
							2014-04-02 12:32:21 +02:00  
				
					
						
							
							
								 
						
							
								21b4280126 
								
							 
						 
						
							
							
								
								Merged in msabramo/pytest/test_writeorg_close_tempfile (pull request  #136 )  
							
							... 
							
							
							
							test_writeorg: Close a tempfile 
							
						 
						
							2014-04-02 09:30:55 +02:00  
				
					
						
							
							
								 
						
							
								ce8678e6d5 
								
							 
						 
						
							
							
								
								remove non-documented per-conftest capturing option and simplify/refactor all code accordingly.  Also make capturing more robust against tests closing FD1/2 and against pdb.set_trace() calls.  
							
							
							
						 
						
							2014-04-01 14:32:12 +02:00  
				
					
						
							
							
								 
						
							
								ca5e6830c6 
								
							 
						 
						
							
							
								
								avoid some redundancy by using SysCapture from FDCapture for manipulating sys.std{out,in,err}  
							
							
							
						 
						
							2014-04-01 14:19:55 +02:00  
				
					
						
							
							
								 
						
							
								69cbac8fb5 
								
							 
						 
						
							
							
								
								rename StdCaptureBase to MultiCapture  
							
							
							
						 
						
							2014-04-01 14:19:52 +02:00  
				
					
						
							
							
								 
						
							
								7301981f32 
								
							 
						 
						
							
							
								
								test_writeorg: Close a tempfile  
							
							... 
							
							
							
							--HG--
branch : test_writeorg_close_tempfile 
							
						 
						
							2014-03-31 08:25:35 -07:00  
				
					
						
							
							
								 
						
							
								9d716a39d6 
								
							 
						 
						
							
							
								
								fix issue412 and other encoding issues.  Streamline dupfile() into  
							
							... 
							
							
							
							a new more thoughtful safe_text_dupfile helper. 
							
						 
						
							2014-03-28 11:27:02 +01:00  
				
					
						
							
							
								 
						
							
								923dcfd620 
								
							 
						 
						
							
							
								
								cleanup and refine issue412 test (still failing on py33)  
							
							
							
						 
						
							2014-03-28 09:46:38 +01:00  
				
					
						
							
							
								 
						
							
								b5467645d3 
								
							 
						 
						
							
							
								
								merge  
							
							
							
						 
						
							2014-03-28 09:27:44 +01:00  
				
					
						
							
							
								 
						
							
								0b340aa1f6 
								
							 
						 
						
							
							
								
								simplify some capturing tests  
							
							
							
						 
						
							2014-03-28 07:55:07 +01:00  
				
					
						
							
							
								 
						
							
								a8f4f49a82 
								
							 
						 
						
							
							
								
								simplify reset/stop_capturing and fix capturing wrt to capturing simple os.write() calls  
							
							
							
						 
						
							2014-03-28 07:11:25 +01:00  
				
					
						
							
							
								 
						
							
								e18c3ed494 
								
							 
						 
						
							
							
								
								unify and normalize Sys/FD Capturing classes  
							
							... 
							
							
							
							* * *
more unification 
							
						 
						
							2014-03-28 07:03:37 +01:00  
				
					
						
							
							
								 
						
							
								2263fcf6b7 
								
							 
						 
						
							
							
								
								remove unused "suspend/resume" on capturing, some formatting cleanup  
							
							
							
						 
						
							2014-03-28 07:03:34 +01:00  
				
					
						
							
							
								 
						
							
								2b2c1e5b7b 
								
							 
						 
						
							
							
								
								condition for python3 of the xfailing test for 412  
							
							
							
						 
						
							2014-03-27 14:01:38 +01:00  
				
					
						
							
							
								 
						
							
								7b63fa5966 
								
							 
						 
						
							
							
								
								merge in current default  
							
							
							
						 
						
							2014-03-27 13:57:54 +01:00  
				
					
						
							
							
								 
						
							
								b18040337a 
								
							 
						 
						
							
							
								
								xfailing test for issue 412  
							
							
							
						 
						
							2014-03-27 13:53:59 +01:00  
				
					
						
							
							
								 
						
							
								9777703e03 
								
							 
						 
						
							
							
								
								- turn on capturing before early conftest loading and make terminal writer  
							
							... 
							
							
							
							use the original stream.
- avoid resetting capture FDs/sys.stdout for each test by keeping capturing
  always turned on and looking at snapshotted capturing data during runtest
  and collection phases. 
							
						 
						
							2014-03-14 12:49:36 +01:00  
				
					
						
							
							
								 
						
							
								b47fdbe0a7 
								
							 
						 
						
							
							
								
								remove externally setting and dealing with "item.outerr" from capturing in favor of a direct interface for adding reporting sections to items.  
							
							... 
							
							
							
							* * *
refactor makereport implementation to avoid recursion with __multicall__ 
							
						 
						
							2014-03-14 12:49:34 +01:00  
				
					
						
							
							
								 
						
							
								1830de2c13 
								
							 
						 
						
							
							
								
								make it clear that this xfail is an unimplemented feature, nothing more.  
							
							
							
						 
						
							2014-01-29 13:56:24 +01:00  
				
					
						
							
							
								 
						
							
								25ab906b8b 
								
							 
						 
						
							
							
								
								add release announcement, bump version to 2.5.2,  
							
							... 
							
							
							
							add links to plugins index, regenerate doc examples. 
							
						 
						
							2014-01-29 13:47:11 +01:00  
				
					
						
							
							
								 
						
							
								4eabfed651 
								
							 
						 
						
							
							
								
								refactor lsof checking and fix an lsof leak in pypy  
							
							
							
						 
						
							2014-01-29 11:18:15 +01:00  
				
					
						
							
							
								 
						
							
								6f385fb4ea 
								
							 
						 
						
							
							
								
								remove "mixed" capturing mode which is not used by pytest  
							
							... 
							
							
							
							--HG--
branch : capsimple1 
							
						 
						
							2014-01-25 19:56:27 +01:00  
				
					
						
							
							
								 
						
							
								18e12cbd67 
								
							 
						 
						
							
							
								
								remove "StdCapture*.call" classmethod because pytest does not use it.  
							
							... 
							
							
							
							--HG--
branch : capsimple1 
							
						 
						
							2014-01-25 19:43:57 +01:00  
				
					
						
							
							
								 
						
							
								3cf4e133cc 
								
							 
						 
						
							
							
								
								remove now parameter because pytest only used now==False everywhere  
							
							... 
							
							
							
							--HG--
branch : capsimple1 
							
						 
						
							2014-01-25 19:42:45 +01:00  
				
					
						
							
							
								 
						
							
								177637bfb9 
								
							 
						 
						
							
							
								
								Redo the Capture integration propperly  
							
							
							
						 
						
							2014-01-24 21:22:19 +01:00  
				
					
						
							
							
								 
						
							
								400b51caf6 
								
							 
						 
						
							
							
								
								mark encoding test as xfail also on py2  
							
							
							
						 
						
							2014-01-22 22:18:33 +01:00  
				
					
						
							
							
								 
						
							
								9aaf0fd340 
								
							 
						 
						
							
							
								
								backing out Ronny's PR because it was merged too early (still has failing tests)  
							
							
							
						 
						
							2014-01-22 22:15:40 +01:00  
				
					
						
							
							
								 
						
							
								ac2f2b1deb 
								
							 
						 
						
							
							
								
								add notes on the copied pylib version  
							
							
							
						 
						
							2014-01-22 21:50:07 +01:00  
				
					
						
							
							
								 
						
							
								0be961a0f3 
								
							 
						 
						
							
							
								
								capture tests: move imports and declarations to the top  
							
							
							
						 
						
							2014-01-22 21:46:35 +01:00  
				
					
						
							
							
								 
						
							
								3cc58c2f78 
								
							 
						 
						
							
							
								
								rewrite all testing uses of py.io to _pytest.capture  
							
							
							
						 
						
							2014-01-22 19:32:23 +01:00  
				
					
						
							
							
								 
						
							
								0ac94134f5 
								
							 
						 
						
							
							
								
								initial code import for capture transfer  
							
							
							
						 
						
							2014-01-22 19:04:38 +01:00  
				
					
						
							
							
								 
						
							
								c142f2551d 
								
							 
						 
						
							
							
								
								xfailing test for captire encoding issues with binary stdio  
							
							
							
						 
						
							2014-01-22 18:07:54 +01:00  
				
					
						
							
							
								 
						
							
								2700a94d49 
								
							 
						 
						
							
							
								
								remove an old duplicate marker and use recent pytest mechanism for parametrization  
							
							
							
						 
						
							2013-11-21 14:40:14 +01:00  
				
					
						
							
							
								 
						
							
								2c7d00579b 
								
							 
						 
						
							
							
								
								bump version, some windows test fixes, prevent logging from raising exceptions at the end (finally), add py25 to tox.ini.  
							
							
							
						 
						
							2013-09-30 16:09:26 +02:00  
				
					
						
							
							
								 
						
							
								db6f347db6 
								
							 
						 
						
							
							
								
								fix issue358 -- introduce new pytest_load_initial_conftests hook and make capturing initialization use it, relying on a new (somewhat internal) parser.parse_known_args() method.  
							
							... 
							
							
							
							This also addresses issue359 -- plugins like pytest-django could implement a pytest_load_initial_conftests hook like the capture plugin. 
							
						 
						
							2013-09-30 13:14:16 +02:00  
				
					
						
							
							
								 
						
							
								ba79c1926c 
								
							 
						 
						
							
							
								
								add a test for issue 14 that will xfail on python < 2.7  
							
							
							
						 
						
							2013-03-25 08:53:08 +01:00  
				
					
						
							
							
								 
						
							
								bb07ba7807 
								
							 
						 
						
							
							
								
								rename a number of internal and externally visible variables to use the fixture name  
							
							... 
							
							
							
							rather than funcargs.  Introduce .funcargnames compatibility attribute for backward compat. 
							
						 
						
							2012-10-05 14:24:44 +02:00  
				
					
						
							
							
								 
						
							
								3049af618c 
								
							 
						 
						
							
							
								
								avoid pyc file issues by parametrizing the test instead of rewriting conftest.py files  
							
							
							
						 
						
							2012-10-04 11:51:14 +02:00  
				
					
						
							
							
								 
						
							
								3f17784386 
								
							 
						 
						
							
							
								
								fix issue128 - show captured output when capsys/capfd are in use  
							
							
							
						 
						
							2012-06-03 21:01:27 +02:00  
				
					
						
							
							
								 
						
							
								8307270cec 
								
							 
						 
						
							
							
								
								yay! now that we have perfect teardowns we don't need some ugly internal hooks anymore.  
							
							
							
						 
						
							2011-12-02 21:00:21 +00:00  
				
					
						
							
							
								 
						
							
								a2f4a11301 
								
							 
						 
						
							
							
								
								refine lsof/FD leakage testing and rework test setup and some of pytest own tests.   Note that the actual diff to non-test code is small.  Also remove some redundant tests (introduced by a copy-paste-error apparently in test_mark.py).  
							
							
							
						 
						
							2011-11-07 18:08:41 +00:00  
				
					
						
							
							
								 
						
							
								d8d88ede65 
								
							 
						 
						
							
							
								
								refine and unify initial capturing - now works also if the logging module  
							
							... 
							
							
							
							is already used from an early-loaded conftest.py file (prior to option parsing) 
							
						 
						
							2011-01-18 12:51:21 +01:00  
				
					
						
							
							
								 
						
							
								2e80512bb8 
								
							 
						 
						
							
							
								
								fix issue8 : avoid errors caused by logging module wanting to close already closed streams.  
							
							... 
							
							
							
							The issue arose if logging was initialized while capturing was enabled
and then capturing streams were closed before process exit, leading
to the logging module to complain. 
							
						 
						
							2010-12-06 16:56:12 +01:00  
				
					
						
							
							
								 
						
							
								b622c85bbf 
								
							 
						 
						
							
							
								
								last changes, preparing 2.0.0  
							
							
							
						 
						
							2010-11-25 20:06:42 +01:00  
				
					
						
							
							
								 
						
							
								bc42cf8ffb 
								
							 
						 
						
							
							
								
								add a way to mark hooks as "tryfirst" or "trylast" to influence its position in a hook chain.  
							
							... 
							
							
							
							Use 'tryfirst' for capturing hooks so they can start capturing as early as possible,
including when conftests add output in runtest_setup hooks. 
							
						 
						
							2010-11-21 23:17:59 +01:00  
				
					
						
							
							
								 
						
							
								a698465487 
								
							 
						 
						
							
							
								
								streamline docs, especially use "import pytest" and "pytest.*" in python code examples instead of "import py" and "py.test.*".  
							
							
							
						 
						
							2010-11-17 22:12:16 +01:00  
				
					
						
							
							
								 
						
							
								076e03e90f 
								
							 
						 
						
							
							
								
								also un-nest test directory  
							
							
							
						 
						
							2010-11-13 11:30:40 +01:00