3e71a50403 
								
							 
						 
						
							
							
								
								Remove unneeded sys import from unittest  
							
							
							
						 
						
							2017-09-22 22:27:50 +02:00  
				
					
						
							
							
								 
						
							
								1ba219e0da 
								
							 
						 
						
							
							
								
								Adapt (logging) unittest  
							
							
							
						 
						
							2017-09-22 22:27:50 +02:00  
				
					
						
							
							
								 
						
							
								cc0f2473eb 
								
							 
						 
						
							
							
								
								Fix windows console workaround error with non-standard io-streams  
							
							... 
							
							
							
							Fix  #2666  
						
							2017-08-07 20:57:13 -03:00  
				
					
						
							
							
								 
						
							
								0603d1d500 
								
							 
						 
						
							
							
								
								capture: ensure name of EncodedFile being a string  
							
							... 
							
							
							
							Fixes https://github.com/pytest-dev/pytest/issues/2555 . 
							
						 
						
							2017-07-25 20:37:37 +02:00  
				
					
						
							
							
								 
						
							
								22f54784c2 
								
							 
						 
						
							
							
								
								Add "fix-lint" tox environment to fix linting errors  
							
							
							
						 
						
							2017-07-20 22:12:15 -03:00  
				
					
						
							
							
								 
						
							
								da12c52347 
								
							 
						 
						
							
							
								
								Fix: do not load hypothesis during test_logging_initialized_in_test  
							
							... 
							
							
							
							A recent release seem to have added a "logging" import to the top-level,
which breaks test_logging_initialized_in_test 
							
						 
						
							2017-07-20 21:43:24 -03:00  
				
					
						
							
							
								 
						
							
								56e6b4b501 
								
							 
						 
						
							
							
								
								Merge pull request  #2578  from Llandy3d/2375  
							
							... 
							
							
							
							Provides encoding attribute on CaptureIO 
							
						 
						
							2017-07-20 23:14:14 +02:00  
				
					
						
							
							
								 
						
							
								7248b759e8 
								
							 
						 
						
							
							
								
								Fixed E303 flake8 errors  
							
							... 
							
							
							
							too many blank lines (3) 
							
						 
						
							2017-07-17 01:44:23 +02:00  
				
					
						
							
							
								 
						
							
								b840622819 
								
							 
						 
						
							
							
								
								Fixed E302 flake8 errors  
							
							... 
							
							
							
							expected 2 blank lines, found 0 
							
						 
						
							2017-07-17 01:44:23 +02:00  
				
					
						
							
							
								 
						
							
								195a816522 
								
							 
						 
						
							
							
								
								Fixed E265 flake8 errors  
							
							... 
							
							
							
							block comment should start with ‘# ‘ 
							
						 
						
							2017-07-17 01:44:22 +02:00  
				
					
						
							
							
								 
						
							
								617e510b6e 
								
							 
						 
						
							
							
								
								Fixed E231 flake8 errors  
							
							... 
							
							
							
							missing whitespace after ‘,’, ‘;’, or ‘:’ 
							
						 
						
							2017-07-17 01:44:22 +02:00  
				
					
						
							
							
								 
						
							
								cf97159009 
								
							 
						 
						
							
							
								
								Fixed E128 flake8 errors  
							
							... 
							
							
							
							continuation line under-indented for visual indent 
							
						 
						
							2017-07-17 01:28:16 +02:00  
				
					
						
							
							
								 
						
							
								ba9a76fdb3 
								
							 
						 
						
							
							
								
								Provides encoding attribute on CaptureIO  
							
							... 
							
							
							
							Fix  #2375  
						
							2017-07-16 14:29:00 +02:00  
				
					
						
							
							
								 
						
							
								f3b359f5b8 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into merge-master-into-features  
							
							... 
							
							
							
							# Conflicts:
#	_pytest/capture.py
#	_pytest/compat.py
#	_pytest/python.py
#	testing/python/collect.py
#	testing/test_mark.py 
							
						 
						
							2017-05-03 19:04:53 -03:00  
				
					
						
							
							
								 
						
							
								e5021dc9dc 
								
							 
						 
						
							
							
								
								Replace py.builtin.print_() calls by builtin print() function  
							
							
							
						 
						
							2017-03-16 22:46:51 -03:00  
				
					
						
							
							
								 
						
							
								42a5d6bdfa 
								
							 
						 
						
							
							
								
								Add __future__ imports to all pytest modules  
							
							... 
							
							
							
							This prevents silly errors from creeping in Python 2 when testing in Python 3 
							
						 
						
							2017-03-16 22:45:40 -03:00  
				
					
						
							
							
								 
						
							
								dc6890709e 
								
							 
						 
						
							
							
								
								Change ValueError to io.UnsupportedOperation in capture.py. Resolves issue  #2276  
							
							
							
						 
						
							2017-03-14 18:55:58 -03:00  
				
					
						
							
							
								 
						
							
								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