aa51fcb2b6 
								
							 
						 
						
							
							
								
								Spelling and grammar fixes  
							
							
							
						 
						
							2018-05-13 12:06:09 +02:00  
				
					
						
							
							
								 
						
							
								b66019202e 
								
							 
						 
						
							
							
								
								Fix test failure on Python 2. Ref  #3314 .  
							
							
							
						 
						
							2018-03-15 21:33:58 -04:00  
				
					
						
							
							
								 
						
							
								2f47624b19 
								
							 
						 
						
							
							
								
								Allow DontReadFromInput to produce iterator without error.  Fixes   #3314 .  
							
							
							
						 
						
							2018-03-15 21:26:40 -04:00  
				
					
						
							
							
								 
						
							
								fbcf1a90c9 
								
							 
						 
						
							
							
								
								Merge pull request  #3193  from pytest-dev/ref-docs  
							
							... 
							
							
							
							Reference docs 
							
						 
						
							2018-03-15 12:04:34 -03:00  
				
					
						
							
							
								 
						
							
								9517c3a2aa 
								
							 
						 
						
							
							
								
								Suppress ``IOError`` when closing the temporary file used for capturing streams in Python 2.7.  
							
							... 
							
							
							
							Fix  #2370  
						
							2018-03-13 17:41:42 -03:00  
				
					
						
							
							
								 
						
							
								18a47bfd22 
								
							 
						 
						
							
							
								
								Add docs for CaptureFixture  
							
							
							
						 
						
							2018-03-06 20:41:21 -03:00  
				
					
						
							
							
								 
						
							
								749288dcb6 
								
							 
						 
						
							
							
								
								Add reference docs to cache and capture fixtures  
							
							
							
						 
						
							2018-03-06 20:41:19 -03:00  
				
					
						
							
							
								 
						
							
								af37778b0d 
								
							 
						 
						
							
							
								
								All classes now subclass object for better py3 compatibility  
							
							... 
							
							
							
							Fix  #2147  
						
							2018-01-24 18:23:42 -02:00  
				
					
						
							
							
								 
						
							
								219b758949 
								
							 
						 
						
							
							
								
								Add capsysbinary fixture  
							
							... 
							
							
							
							`capsysbinary` works like `capsys` but produces bytes for `readouterr()`. 
							
						 
						
							2017-11-17 09:02:46 -08:00  
				
					
						
							
							
								 
						
							
								8f90812481 
								
							 
						 
						
							
							
								
								Add capfdbinary fixture  
							
							... 
							
							
							
							`capfdbinary` works like `capfd` but produces bytes for `readouterr()`. 
							
						 
						
							2017-11-14 14:50:00 -08:00  
				
					
						
							
							
								 
						
							
								b27dde24d6 
								
							 
						 
						
							
							
								
								Use a nametuple for `readouterr()` results  
							
							... 
							
							
							
							This allows accessing `out` and `err` directly by attribute,
while preserving tuple unpacking.
Also added tests, one for the `capsys` fixture, and one for the
`MultiCapture` class itself. 
							
						 
						
							2017-10-28 14:53:19 -04:00  
				
					
						
							
							
								 
						
							
								f9589f7b64 
								
							 
						 
						
							
							
								
								Resume output capturing after capsys/capfd.disabled() context manager  
							
							... 
							
							
							
							Fix  #1993  
						
							2017-09-29 17:24:31 -03:00  
				
					
						
							
							
								 
						
							
								22f338d74d 
								
							 
						 
						
							
							
								
								Refactor some names for better understanding and consistency  
							
							
							
						 
						
							2017-09-26 20:09:42 -03:00  
				
					
						
							
							
								 
						
							
								9919269ed0 
								
							 
						 
						
							
							
								
								Allow to use capsys and capfd in other fixtures  
							
							... 
							
							
							
							Fix  #2709  
						
							2017-09-26 20:09:36 -03:00  
				
					
						
							
							
								 
						
							
								f825b4979b 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into features  
							
							
							
						 
						
							2017-09-05 19:44:33 -03:00  
				
					
						
							
							
								 
						
							
								cc0f2473eb 
								
							 
						 
						
							
							
								
								Fix windows console workaround error with non-standard io-streams  
							
							... 
							
							
							
							Fix  #2666  
						
							2017-08-07 20:57:13 -03:00  
				
					
						
							
							
								 
						
							
								dc563e4954 
								
							 
						 
						
							
							
								
								convert py module references to six module  
							
							
							
						 
						
							2017-08-04 08:05:03 +05:30  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								d0ecfdf00f 
								
							 
						 
						
							
							
								
								Delete trailing whitespace  
							
							
							
						 
						
							2017-07-24 16:55:50 +03:00  
				
					
						
							
							
								 
						
							
								43544a431c 
								
							 
						 
						
							
							
								
								Early import colorama so that it get's the correct terminal  
							
							
							
						 
						
							2017-07-24 15:17:39 +03:00  
				
					
						
							
							
								 
						
							
								b840622819 
								
							 
						 
						
							
							
								
								Fixed E302 flake8 errors  
							
							... 
							
							
							
							expected 2 blank lines, found 0 
							
						 
						
							2017-07-17 01:44:23 +02:00  
				
					
						
							
							
								 
						
							
								17a21d540b 
								
							 
						 
						
							
							
								
								Fixed E301 flake8 errors  
							
							... 
							
							
							
							expected 1 blank line, 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  
				
					
						
							
							
								 
						
							
								8f3eb6dfc7 
								
							 
						 
						
							
							
								
								Fixed E261 flake8 errors  
							
							... 
							
							
							
							at least two spaces before inline comment 
							
						 
						
							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  
				
					
						
							
							
								 
						
							
								59b3693988 
								
							 
						 
						
							
							
								
								Fixed wrong if in the WindowsConsoleIO workaround  
							
							
							
						 
						
							2017-06-02 12:34:26 +03:00  
				
					
						
							
							
								 
						
							
								05796be21a 
								
							 
						 
						
							
							
								
								A workaround for Python 3.6 WindowsConsoleIO breaking with FDCapture  
							
							... 
							
							
							
							Python 3.6 implemented unicode console handling for Windows. This works
by reading/writing to the raw console handle using
``{Read,Write}ConsoleW``.
The problem is that we are going to ``dup2`` over the stdio file
descriptors when doing ``FDCapture`` and this will ``CloseHandle`` the
handles used by Python to write to the console. Though there is still some
weirdness and the console handle seems to only be closed randomly and not
on the first call to ``CloseHandle``, or maybe it gets reopened with the
same handle value when we suspend capturing.
The workaround in this case will reopen stdio with a different fd which
also means a different handle by replicating the logic in
"Py_lifecycle.c:initstdio/create_stdio".
See https://github.com/pytest-dev/py/issues/103  
							
						 
						
							2017-06-02 11:19:03 +03:00  
				
					
						
							
							
								 
						
							
								d86c89e193 
								
							 
						 
						
							
							
								
								Revert refactor of old-style to new-style classes  
							
							... 
							
							
							
							As discussed in the mailing list, unfortunately this might break APIs
due to the subtle differences between new and old-style classes (see #2398 ).
This reverts commit d4afa1554b#2179 . 
							
						 
						
							2017-05-17 18:20: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  
				
					
						
							
							
								 
						
							
								6ba3475448 
								
							 
						 
						
							
							
								
								Make capsys more like stdio streams in python3.   Resolves   #1407 .  
							
							
							
						 
						
							2017-02-23 17:46:27 -08:00  
				
					
						
							
							
								 
						
							
								d4afa1554b 
								
							 
						 
						
							
							
								
								Refactored old style classes to new style classes  
							
							
							
						 
						
							2017-01-08 22:52:42 -06:00  
				
					
						
							
							
								 
						
							
								5ce551e469 
								
							 
						 
						
							
							
								
								Merge pull request  #2075  from pytest-dev/master  
							
							... 
							
							
							
							Merge master into features after fixing flake8 errors 
							
						 
						
							2016-11-22 14:10:31 -02:00  
				
					
						
							
							
								 
						
							
								1eb5a690d4 
								
							 
						 
						
							
							
								
								Fix flake8 E305 and E306 errors  
							
							... 
							
							
							
							These errors started to appear with flake8-3.1.1, while they don't appear with
version 3.1.0 (weird). 
							
						 
						
							2016-11-20 18:59:15 -02:00  
				
					
						
							
							
								 
						
							
								3444796f3e 
								
							 
						 
						
							
							
								
								Fix formating error.  
							
							
							
						 
						
							2016-09-26 13:59:28 +03:00  
				
					
						
							
							
								 
						
							
								8985c0be3e 
								
							 
						 
						
							
							
								
								Change exception raised by DontReadFromInput.fileno() from ValueError to io.UnsupportedOperation  
							
							
							
						 
						
							2016-09-26 13:15:35 +03: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  
				
					
						
							
							
								 
						
							
								7e37497d5a 
								
							 
						 
						
							
							
								
								Uppercase first word in docstrings. Change to an imperative form. Add name to authors.  
							
							
							
						 
						
							2016-07-22 12:39:06 +02:00  
				
					
						
							
							
								 
						
							
								775100881a 
								
							 
						 
						
							
							
								
								Implement invocation-scoped fixtures  
							
							
							
						 
						
							2016-07-09 22:52:05 -03:00  
				
					
						
							
							
								 
						
							
								ef9dd14963 
								
							 
						 
						
							
							
								
								Introduce pytest command as recommended entry point  
							
							... 
							
							
							
							Fixes  #1629  
						
							2016-06-21 16:16:57 +02:00  
				
					
						
							
							
								 
						
							
								72bf11cbe9 
								
							 
						 
						
							
							
								
								Add disabled() method to capsys and capfd  
							
							... 
							
							
							
							Fix  #1599  
						
							2016-06-19 19:14:36 +02:00  
				
					
						
							
							
								 
						
							
								5afb61ad26 
								
							 
						 
						
							
							
								
								Fix trailing white-space  
							
							
							
						 
						
							2015-12-25 17:51:55 -02:00  
				
					
						
							
							
								 
						
							
								57bc14caa0 
								
							 
						 
						
							
							
								
								Apply readline workaround during initial conftest loading  
							
							
							
						 
						
							2015-12-25 17:46:19 -02:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								c10f483b9f 
								
							 
						 
						
							
							
								
								Don't hardcode 'std' for captured stdout/stderr.  
							
							... 
							
							
							
							This will make Item.add_report_sect more usable for plugins.
See https://github.com/eisensheng/pytest-catchlog/pull/7  
							
						 
						
							2015-09-22 20:29:16 +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  
				
					
						
							
							
								 
						
							
								bddc88f09e 
								
							 
						 
						
							
							
								
								adapt to pluggy naming, rename pytest.hookspec_opts to pytest.hookspec,s ame with hookimpl_opts  
							
							... 
							
							
							
							--HG--
branch : pluggy1 
							
						 
						
							2015-05-06 10:08:08 +02:00  
				
					
						
							
							
								 
						
							
								d2a5c7f99b 
								
							 
						 
						
							
							
								
								add documented hookimpl_opts and hookspec_opts decorators  
							
							... 
							
							
							
							so that one doesn't have to use pytest.mark or function-attribute setting anymore
--HG--
branch : more_plugin 
							
						 
						
							2015-04-25 11:29:11 +02:00  
				
					
						
							
							
								 
						
							
								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