Daniel Hahler
							
						 
						
							 
							
							
							
							
								
							
							
								60ceec6eb1 
								
							 
						 
						
							
							
								
								tests: fix testing/test_capture.py::test_typeerror_encodedfile_write  
							
							 
							
							... 
							
							
							
							Failed for me due to different indent (?) - not reproducible:
    >   ???
    E   Failed: nomatch: 'E           TypeError: write() argument must be str, not bytes'
    …
    E       and: '>   def mode(self):'
    E       and: 'E   TypeError: write() argument must be str, not bytes'
    …
    E   remains unmatched: 'E           TypeError: write() argument must be str, not bytes' 
							
						 
						
							2019-10-28 14:37:26 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Hahler
							
						 
						
							 
							
							
							
							
								
							
							
								820b747e7a 
								
							 
						 
						
							
							
								
								tests: merge/remove test_dontreadfrominput_buffer_python3  
							
							 
							
							
							
						 
						
							2019-10-27 19:32:06 +01:00  
						
					 
				
					
						
							
							
								 
								MarcoGorelli
							
						 
						
							 
							
							
							
							
								
							
							
								d863c30c74 
								
							 
						 
						
							
							
								
								Fix plurality mismatch for  and  in pytest terminal summary  
							
							 
							
							
							
						 
						
							2019-10-27 15:16:24 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Hahler
							
						 
						
							 
							
							
							
							
								
							
							
								81c3bc76bc 
								
							 
						 
						
							
							
								
								tests: harden test_disabled_capture_fixture  
							
							 
							
							
							
						 
						
							2019-10-27 03:02:24 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Hahler
							
						 
						
							 
							
							
							
							
								
							
							
								7f1af84f47 
								
							 
						 
						
							
							
								
								Merge master into features  
							
							 
							
							... 
							
							
							
							Conflicts:
	src/_pytest/logging.py 
							
						 
						
							2019-10-27 02:06:36 +01:00  
						
					 
				
					
						
							
							
								 
								Ran Benita
							
						 
						
							 
							
							
							
							
								
							
							
								0b8c35516f 
								
							 
						 
						
							
							
								
								Replace py.io.TextIO with io.StringIO  
							
							 
							
							... 
							
							
							
							In Python3, py.io.TextIO is just an alias to io.StringIO. Remove the
indirection. 
							
						 
						
							2019-10-26 16:33:57 +03:00  
						
					 
				
					
						
							
							
								 
								Ran Benita
							
						 
						
							 
							
							
							
							
								
							
							
								1787bffda0 
								
							 
						 
						
							
							
								
								Fix check_untyped_defs errors in capture  
							
							 
							
							
							
						 
						
							2019-10-23 14:20:15 +03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								47c2091ecd 
								
							 
						 
						
							
							
								
								Use new no-match functions to replace previous idiom  
							
							 
							
							
							
						 
						
							2019-10-06 18:05:24 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								019455298b 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/features' into merge-features-into-master  
							
							 
							
							
							
						 
						
							2019-06-25 12:07:54 -03:00  
						
					 
				
					
						
							
							
								 
								Zac Hatfield-Dodds
							
						 
						
							 
							
							
							
							
								
							
							
								d72fb73fa0 
								
							 
						 
						
							
							
								
								Do not allow abbreviated arguments  
							
							 
							
							
							
						 
						
							2019-06-25 13:51:33 +10:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								2b92fee1c3 
								
							 
						 
						
							
							
								
								initial conversion of exit codes to enum  
							
							 
							
							
							
						 
						
							2019-06-15 06:48:00 +02:00  
						
					 
				
					
						
							
							
								 
								Anthony Sottile
							
						 
						
							 
							
							
							
							
								
							
							
								be2be040f9 
								
							 
						 
						
							
							
								
								Clean up u' prefixes and py2 bytes conversions  
							
							 
							
							
							
						 
						
							2019-06-04 17:50:34 -07:00  
						
					 
				
					
						
							
							
								 
								Anthony Sottile
							
						 
						
							 
							
							
							
							
								
							
							
								4df529e5b9 
								
							 
						 
						
							
							
								
								Clean up __future__ and coding: in tests  
							
							 
							
							
							
						 
						
							2019-06-03 12:08:02 -03:00  
						
					 
				
					
						
							
							
								 
								Anthony Sottile
							
						 
						
							 
							
							
							
							
								
							
							
								a91fe1fedd 
								
							 
						 
						
							
							
								
								pre-commit run pyupgrade --all-files  
							
							 
							
							
							
						 
						
							2019-06-03 12:08:02 -03:00  
						
					 
				
					
						
							
							
								 
								Anthony Sottile
							
						 
						
							 
							
							
							
							
								
							
							
								3f1ec520fc 
								
							 
						 
						
							
							
								
								pre-commit run reorder-python-imports --all-files  
							
							 
							
							
							
						 
						
							2019-06-03 12:08:01 -03:00  
						
					 
				
					
						
							
							
								 
								Anthony Sottile
							
						 
						
							 
							
							
							
							
								
							
							
								5034399d7a 
								
							 
						 
						
							
							
								
								pre-commit run fix-encoding-pragma --all-files  
							
							 
							
							
							
						 
						
							2019-06-03 12:08:01 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								4d49ba6529 
								
							 
						 
						
							
							
								
								Drop Python 2.7 and 3.4 support  
							
							 
							
							... 
							
							
							
							* Update setup.py requires and classifiers
* Drop Python 2.7 and 3.4 from CI
* Update docs dropping 2.7 and 3.4 support
* Fix mock imports and remove tests related to pypi's mock module
* Add py27 and 34 support docs to the sidebar
* Remove usage of six from tmpdir
* Remove six.PY* code blocks
* Remove sys.version_info related code
* Cleanup compat
* Remove obsolete safe_str
* Remove obsolete __unicode__ methods
* Remove compat.PY35 and compat.PY36: not really needed anymore
* Remove unused UNICODE_TYPES
* Remove Jython specific code
* Remove some Python 2 references from docs
Related to #5275  
							
						 
						
							2019-06-02 14:39:11 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								66f20b6f5e 
								
							 
						 
						
							
							
								
								Fix invalid Python file encoding "utf8" ( #5252 )  
							
							 
							
							... 
							
							
							
							Fix invalid Python file encoding "utf8" 
							
						 
						
							2019-05-23 20:24:23 -03:00  
						
					 
				
					
						
							
							
								 
								Anthony Sottile
							
						 
						
							 
							
							
							
							
								
							
							
								dc75b6af47 
								
							 
						 
						
							
							
								
								Use fix-encoding-pragma pre-commit hook  
							
							 
							
							
							
						 
						
							2019-05-14 15:56:31 -07:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								7573747cda 
								
							 
						 
						
							
							
								
								Normalize all source encoding declarations  
							
							 
							
							
							
						 
						
							2019-05-14 19:42:44 -03:00  
						
					 
				
					
						
							
							
								 
								Anthony Sottile
							
						 
						
							 
							
							
							
							
								
							
							
								4318698bae 
								
							 
						 
						
							
							
								
								Remove 'b' from sys.stdout.mode  
							
							 
							
							
							
						 
						
							2019-05-14 15:00:59 -07:00  
						
					 
				
					
						
							
							
								 
								Raul Tambre
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								18024467ff 
								
							 
						 
						
							
							
								
								Fix invalid Python file encoding "utf8"  
							
							 
							
							... 
							
							
							
							Since Python 3 it must be "utf-8", which is the official name.
This is backwards compatible with Python 2. 
							
						 
						
							2019-05-12 19:14:06 +03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								f1183c2422 
								
							 
						 
						
							
							
								
								Remove the 'issue' marker from test suite  
							
							 
							
							... 
							
							
							
							It doesn't seem to add much value (why would one execute tests
based on that marker?), plus using the docstring for that
encourages one to write a more descriptive message about the test 
							
						 
						
							2019-05-09 19:36:38 -03:00  
						
					 
				
					
						
							
							
								 
								Daniel Hahler
							
						 
						
							 
							
							
							
							
								
							
							
								698c4e75fd 
								
							 
						 
						
							
							
								
								capture: track current state in _state attributes  
							
							 
							
							... 
							
							
							
							This is meant for debugging, and making assertions later. 
							
						 
						
							2019-04-19 00:35:15 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Hahler
							
						 
						
							 
							
							
							
							
								
							
							
								148f2fc72c 
								
							 
						 
						
							
							
								
								Fix test_error_during_readouterr: syspathinsert is unused  
							
							 
							
							
							
						 
						
							2019-04-10 21:57:45 +02:00  
						
					 
				
					
						
							
							
								 
								Zac-HD
							
						 
						
							 
							
							
							
							
								
							
							
								00810b9b2a 
								
							 
						 
						
							
							
								
								Register "issue" mark for self-tests  
							
							 
							
							
							
						 
						
							2019-03-31 14:22:30 +11:00  
						
					 
				
					
						
							
							
								 
								Daniel Hahler
							
						 
						
							 
							
							
							
							
								
							
							
								e1ae469504 
								
							 
						 
						
							
							
								
								Merge master into features  
							
							 
							
							
							
						 
						
							2019-03-26 10:23:21 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Hahler
							
						 
						
							 
							
							
							
							
								
							
							
								d0f3f26fff 
								
							 
						 
						
							
							
								
								test_collect_capturing: cover captured stderr  
							
							 
							
							
							
						 
						
							2019-03-23 23:17:07 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Hahler
							
						 
						
							 
							
							
							
							
								
							
							
								08f3b02dfc 
								
							 
						 
						
							
							
								
								tests: fnmatch_lines: use list  
							
							 
							
							... 
							
							
							
							For strings fnmatch_lines converts it into a Source objects, splitted on
newlines.  This is not necessary here, and it is more consistent to use
lists here in the first place. 
							
						 
						
							2019-03-23 11:36:18 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Hahler
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								da81c1e49a 
								
							 
						 
						
							
							
								
								Merge pull request  #4950  from blueyed/capture  
							
							 
							
							... 
							
							
							
							Revisit capturing module: repr, doc fixes, minor 
							
						 
						
							2019-03-20 01:12:22 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Hahler
							
						 
						
							 
							
							
							
							
								
							
							
								920bffbfbb 
								
							 
						 
						
							
							
								
								Revisit _pytest.capture: repr, doc fixes, minor  
							
							 
							
							
							
						 
						
							2019-03-19 01:17:21 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Hahler
							
						 
						
							 
							
							
							
							
								
							
							
								98981276a0 
								
							 
						 
						
							
							
								
								capture: fix FDCapture.__repr__ without targetfd_save  
							
							 
							
							
							
						 
						
							2019-03-18 02:33:03 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Hahler
							
						 
						
							 
							
							
							
							
								
							
							
								83558a0ba3 
								
							 
						 
						
							
							
								
								tests: make test_crash_on_closing_tmpfile_py27 more reliable  
							
							 
							
							... 
							
							
							
							It fails reliable for me now without the fix from 9517c3a2a .
Ref: #2370  
							
						 
						
							2019-03-04 15:04:55 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Hahler
							
						 
						
							 
							
							
							
							
								
							
							
								a51dc0c7ce 
								
							 
						 
						
							
							
								
								Validate type with writing to captured output like without  
							
							 
							
							... 
							
							
							
							Fixes https://github.com/pytest-dev/pytest/issues/4861 . 
							
						 
						
							2019-03-01 14:03:51 +01:00  
						
					 
				
					
						
							
							
								 
								Thomas Hisch
							
						 
						
							 
							
							
							
							
								
							
							
								a2954578aa 
								
							 
						 
						
							
							
								
								Remove stdlib test  
							
							 
							
							
							
						 
						
							2019-01-22 20:25:51 +01:00  
						
					 
				
					
						
							
							
								 
								Anthony Sottile
							
						 
						
							 
							
							
							
							
								
							
							
								92a2c1a9c4 
								
							 
						 
						
							
							
								
								remove and ban py.io.BytesIO, py.process, py.path.local.sysfind  
							
							 
							
							
							
						 
						
							2019-01-21 19:51:16 -08:00  
						
					 
				
					
						
							
							
								 
								Daniel Hahler
							
						 
						
							 
							
							
							
							
								
							
							
								0db5ccb0dd 
								
							 
						 
						
							
							
								
								Merge master into features  
							
							 
							
							
							
						 
						
							2018-12-10 05:42:07 +01:00  
						
					 
				
					
						
							
							
								 
								Pedro Algarvio
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								6da8befc74 
								
							 
						 
						
							
							
								
								Black suggestions  
							
							 
							
							
							
						 
						
							2018-12-03 12:58:22 +00:00  
						
					 
				
					
						
							
							
								 
								Pedro Algarvio
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								14024c7fc1 
								
							 
						 
						
							
							
								
								Test case for  #4500  bug and respective  fix   #4487  
							
							 
							
							
							
						 
						
							2018-12-03 12:17:14 +00:00  
						
					 
				
					
						
							
							
								 
								Pedro Algarvio
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								517b8bc69e 
								
							 
						 
						
							
							
								
								Stop using the deprecated `\.warn()` log handler method  
							
							 
							
							
							
						 
						
							2018-12-03 11:52:33 +00:00  
						
					 
				
					
						
							
							
								 
								Anthony Sottile
							
						 
						
							 
							
							
							
							
								
							
							
								1bba0a9714 
								
							 
						 
						
							
							
								
								Deprecate `raises(..., 'code(as_a_string)')` / `warns(..., 'code(as_a_string)')  
							
							 
							
							
							
						 
						
							2018-11-29 09:34:51 -08:00  
						
					 
				
					
						
							
							
								 
								Anthony Sottile
							
						 
						
							 
							
							
							
							
								
							
							
								b3700f61ba 
								
							 
						 
						
							
							
								
								Fix formatting of print() calls  
							
							 
							
							
							
						 
						
							2018-11-22 00:15:14 -08:00  
						
					 
				
					
						
							
							
								 
								Anthony Sottile
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								4bf6a07fe2 
								
							 
						 
						
							
							
								
								Merge pull request  #4305  from RonnyPfannschmidt/cleanup-tobytes  
							
							 
							
							... 
							
							
							
							replace byte/unicode helpers in test_capture with python level syntax 
							
						 
						
							2018-11-04 17:29:41 -08:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								7cb271b46f 
								
							 
						 
						
							
							
								
								replace byte/unicode helpers in test_capture with python level syntax  
							
							 
							
							
							
						 
						
							2018-11-04 22:01:01 +01:00  
						
					 
				
					
						
							
							
								 
								Anthony Sottile
							
						 
						
							 
							
							
							
							
								
							
							
								2368fbb63c 
								
							 
						 
						
							
							
								
								Apply reorder-python-imports to all files  
							
							 
							
							
							
						 
						
							2018-10-25 00:01:29 -07:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								8e4501ee29 
								
							 
						 
						
							
							
								
								Use std_warn for warning about applying marks directly to parameters  
							
							 
							
							
							
						 
						
							2018-09-04 11:35:34 -03:00  
						
					 
				
					
						
							
							
								 
								Anthony Sottile
							
						 
						
							 
							
							
							
							
								
							
							
								99e31f6fb1 
								
							 
						 
						
							
							
								
								Use `bytes` directly instead of `binary_type`  
							
							 
							
							... 
							
							
							
							`bytes` is an alias for `str` in python2.6+ 
							
						 
						
							2018-08-23 18:55:21 -07:00  
						
					 
				
					
						
							
							
								 
								Anthony Sottile
							
						 
						
							 
							
							
							
							
								
							
							
								85482d575e 
								
							 
						 
						
							
							
								
								Replace Source with dedent where possible  
							
							 
							
							
							
						 
						
							2018-08-23 09:06:17 -07:00  
						
					 
				
					
						
							
							
								 
								Anthony Sottile
							
						 
						
							 
							
							
							
							
								
							
							
								0fc4a806e5 
								
							 
						 
						
							
							
								
								py.builtins._totext -> string literals or six.text_type  
							
							 
							
							
							
						 
						
							2018-08-22 23:00:04 -07:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								f1079a8222 
								
							 
						 
						
							
							
								
								Merge pull request  #3832  from Sup3rGeo/bugfix/capsys-with-cli-logging  
							
							 
							
							... 
							
							
							
							Bugfix/capsys with cli logging (again) 
							
						 
						
							2018-08-21 20:12:31 -03:00  
						
					 
				
					
						
							
							
								 
								Victor
							
						 
						
							 
							
							
							
							
								
							
							
								70ebab3537 
								
							 
						 
						
							
							
								
								Renamed snap_global_capture to read_global_capture.  
							
							 
							
							
							
						 
						
							2018-08-20 17:48:14 +02:00  
						
					 
				
					
						
							
							
								 
								Victor
							
						 
						
							 
							
							
							
							
								
							
							
								d611b03589 
								
							 
						 
						
							
							
								
								Parametrized tests for capfd as well. Separated global capture test.  
							
							 
							
							
							
						 
						
							2018-08-20 12:23:59 +02:00  
						
					 
				
					
						
							
							
								 
								victor
							
						 
						
							 
							
							
							
							
								
							
							
								7ea4992f16 
								
							 
						 
						
							
							
								
								Fixed linting.  
							
							 
							
							
							
						 
						
							2018-08-19 15:46:02 +02:00  
						
					 
				
					
						
							
							
								 
								victor
							
						 
						
							 
							
							
							
							
								
							
							
								0564b52c0e 
								
							 
						 
						
							
							
								
								Fixed integration with other modules/tests  
							
							 
							
							
							
						 
						
							2018-08-19 15:26:57 +02:00  
						
					 
				
					
						
							
							
								 
								victor
							
						 
						
							 
							
							
							
							
								
							
							
								9e382e8d29 
								
							 
						 
						
							
							
								
								Fixed test.  
							
							 
							
							
							
						 
						
							2018-08-19 14:29:57 +02:00  
						
					 
				
					
						
							
							
								 
								victor
							
						 
						
							 
							
							
							
							
								
							
							
								2255892d65 
								
							 
						 
						
							
							
								
								Improved test to cover more cases.  
							
							 
							
							
							
						 
						
							2018-08-19 13:44:12 +02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								f4c5994d27 
								
							 
						 
						
							
							
								
								Fixtures during teardown can use capsys and capfd to get output from tests  
							
							 
							
							... 
							
							
							
							Fix  #3033  
							
						 
						
							2018-08-18 14:46:24 -03:00  
						
					 
				
					
						
							
							
								 
								Tyler Richard
							
						 
						
							 
							
							
							
							
								
							
							
								c24c7e75e2 
								
							 
						 
						
							
							
								
								Added regression test for capfd in a fixture  
							
							 
							
							
							
						 
						
							2018-08-18 14:11:04 -03:00  
						
					 
				
					
						
							
							
								 
								Victor
							
						 
						
							 
							
							
							
							
								
							
							
								3059bfb1b3 
								
							 
						 
						
							
							
								
								Update test with another problem.  
							
							 
							
							
							
						 
						
							2018-08-17 13:00:27 +02:00  
						
					 
				
					
						
							
							
								 
								Victor
							
						 
						
							 
							
							
							
							
								
							
							
								da9d814da4 
								
							 
						 
						
							
							
								
								Added test.  
							
							 
							
							
							
						 
						
							2018-08-17 00:20:51 +02:00  
						
					 
				
					
						
							
							
								 
								Anthony Sottile
							
						 
						
							 
							
							
							
							
								
							
							
								4ae93a7a07 
								
							 
						 
						
							
							
								
								Remove obsolete __future__ imports  
							
							 
							
							
							
						 
						
							2018-07-08 08:37:02 -07:00  
						
					 
				
					
						
							
							
								 
								Anthony Sottile
							
						 
						
							 
							
							
							
							
								
							
							
								cbaa7dd56a 
								
							 
						 
						
							
							
								
								Upgrade pre-commit hooks except pyupgrade  
							
							 
							
							
							
						 
						
							2018-06-26 06:35:27 -07:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								464117b472 
								
							 
						 
						
							
							
								
								fix imports in tests  
							
							 
							
							
							
						 
						
							2018-06-05 10:20:36 +02:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								3e08c4ee64 
								
							 
						 
						
							
							
								
								sort out flake8 issues and unicode name usage  
							
							 
							
							
							
						 
						
							2018-05-23 18:12:04 +02:00  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								703e4b11ba 
								
							 
						 
						
							
							
								
								run black  
							
							 
							
							
							
						 
						
							2018-05-23 16:48:46 +02:00  
						
					 
				
					
						
							
							
								 
								Ville Skyttä
							
						 
						
							 
							
							
							
							
								
							
							
								aa51fcb2b6 
								
							 
						 
						
							
							
								
								Spelling and grammar fixes  
							
							 
							
							
							
						 
						
							2018-05-13 12:06:09 +02:00  
						
					 
				
					
						
							
							
								 
								Jason R. Coombs
							
						 
						
							 
							
							
							
							
								
							
							
								3c3fc3bb9d 
								
							 
						 
						
							
							
								
								Add test capturing new expectation. Ref  #3314 .  
							
							 
							
							
							
						 
						
							2018-03-15 21:25:50 -04:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								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  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								af37778b0d 
								
							 
						 
						
							
							
								
								All classes now subclass object for better py3 compatibility  
							
							 
							
							... 
							
							
							
							Fix  #2147  
							
						 
						
							2018-01-24 18:23:42 -02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								dab889304e 
								
							 
						 
						
							
							
								
								Implement progress percentage reporting while running tests  
							
							 
							
							... 
							
							
							
							Fix  #2657  
							
						 
						
							2017-11-21 21:01:41 -02:00  
						
					 
				
					
						
							
							
								 
								Anthony Sottile
							
						 
						
							 
							
							
							
							
								
							
							
								219b758949 
								
							 
						 
						
							
							
								
								Add capsysbinary fixture  
							
							 
							
							... 
							
							
							
							`capsysbinary` works like `capsys` but produces bytes for `readouterr()`. 
							
						 
						
							2017-11-17 09:02:46 -08:00  
						
					 
				
					
						
							
							
								 
								Anthony Sottile
							
						 
						
							 
							
							
							
							
								
							
							
								8f90812481 
								
							 
						 
						
							
							
								
								Add capfdbinary fixture  
							
							 
							
							... 
							
							
							
							`capfdbinary` works like `capfd` but produces bytes for `readouterr()`. 
							
						 
						
							2017-11-14 14:50:00 -08:00  
						
					 
				
					
						
							
							
								 
								Samuel Dion-Girardeau
							
						 
						
							 
							
							
							
							
								
							
							
								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  
						
					 
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 
						
							 
							
							
							
							
								
							
							
								c750a5beec 
								
							 
						 
						
							
							
								
								Merge pull request  #2794  from thisch/catchlog  
							
							 
							
							... 
							
							
							
							Merge pytest-catchlog plugin 
							
						 
						
							2017-10-12 09:02:46 +02:00  
						
					 
				
					
						
							
							
								 
								Thomas Hisch
							
						 
						
							 
							
							
							
							
								
							
							
								8aed5fecd9 
								
							 
						 
						
							
							
								
								Remove test_logging_initialized_in_test  
							
							 
							
							
							
						 
						
							2017-10-12 02:19:24 +02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								f9589f7b64 
								
							 
						 
						
							
							
								
								Resume output capturing after capsys/capfd.disabled() context manager  
							
							 
							
							... 
							
							
							
							Fix  #1993  
							
						 
						
							2017-09-29 17:24:31 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								22f338d74d 
								
							 
						 
						
							
							
								
								Refactor some names for better understanding and consistency  
							
							 
							
							
							
						 
						
							2017-09-26 20:09:42 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								9919269ed0 
								
							 
						 
						
							
							
								
								Allow to use capsys and capfd in other fixtures  
							
							 
							
							... 
							
							
							
							Fix  #2709  
							
						 
						
							2017-09-26 20:09:36 -03:00  
						
					 
				
					
						
							
							
								 
								Thomas Hisch
							
						 
						
							 
							
							
							
							
								
							
							
								3e71a50403 
								
							 
						 
						
							
							
								
								Remove unneeded sys import from unittest  
							
							 
							
							
							
						 
						
							2017-09-22 22:27:50 +02:00  
						
					 
				
					
						
							
							
								 
								Thomas Hisch
							
						 
						
							 
							
							
							
							
								
							
							
								1ba219e0da 
								
							 
						 
						
							
							
								
								Adapt (logging) unittest  
							
							 
							
							
							
						 
						
							2017-09-22 22:27:50 +02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								cc0f2473eb 
								
							 
						 
						
							
							
								
								Fix windows console workaround error with non-standard io-streams  
							
							 
							
							... 
							
							
							
							Fix  #2666  
							
						 
						
							2017-08-07 20:57:13 -03:00  
						
					 
				
					
						
							
							
								 
								Daniel Hahler
							
						 
						
							 
							
							
							
							
								
							
							
								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  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								22f54784c2 
								
							 
						 
						
							
							
								
								Add "fix-lint" tox environment to fix linting errors  
							
							 
							
							
							
						 
						
							2017-07-20 22:12:15 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								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  
						
					 
				
					
						
							
							
								 
								Floris Bruynooghe
							
						 
						
							 
							
							
							
							
								
							
							
								56e6b4b501 
								
							 
						 
						
							
							
								
								Merge pull request  #2578  from Llandy3d/2375  
							
							 
							
							... 
							
							
							
							Provides encoding attribute on CaptureIO 
							
						 
						
							2017-07-20 23:14:14 +02:00  
						
					 
				
					
						
							
							
								 
								Andras Tim
							
						 
						
							 
							
							
							
							
								
							
							
								7248b759e8 
								
							 
						 
						
							
							
								
								Fixed E303 flake8 errors  
							
							 
							
							... 
							
							
							
							too many blank lines (3) 
							
						 
						
							2017-07-17 01:44:23 +02:00  
						
					 
				
					
						
							
							
								 
								Andras Tim
							
						 
						
							 
							
							
							
							
								
							
							
								b840622819 
								
							 
						 
						
							
							
								
								Fixed E302 flake8 errors  
							
							 
							
							... 
							
							
							
							expected 2 blank lines, found 0 
							
						 
						
							2017-07-17 01:44:23 +02:00  
						
					 
				
					
						
							
							
								 
								Andras Tim
							
						 
						
							 
							
							
							
							
								
							
							
								195a816522 
								
							 
						 
						
							
							
								
								Fixed E265 flake8 errors  
							
							 
							
							... 
							
							
							
							block comment should start with ‘# ‘ 
							
						 
						
							2017-07-17 01:44:22 +02:00  
						
					 
				
					
						
							
							
								 
								Andras Tim
							
						 
						
							 
							
							
							
							
								
							
							
								617e510b6e 
								
							 
						 
						
							
							
								
								Fixed E231 flake8 errors  
							
							 
							
							... 
							
							
							
							missing whitespace after ‘,’, ‘;’, or ‘:’ 
							
						 
						
							2017-07-17 01:44:22 +02:00  
						
					 
				
					
						
							
							
								 
								Andras Tim
							
						 
						
							 
							
							
							
							
								
							
							
								cf97159009 
								
							 
						 
						
							
							
								
								Fixed E128 flake8 errors  
							
							 
							
							... 
							
							
							
							continuation line under-indented for visual indent 
							
						 
						
							2017-07-17 01:28:16 +02:00  
						
					 
				
					
						
							
							
								 
								Llandy Riveron Del Risco
							
						 
						
							 
							
							
							
							
								
							
							
								ba9a76fdb3 
								
							 
						 
						
							
							
								
								Provides encoding attribute on CaptureIO  
							
							 
							
							... 
							
							
							
							Fix  #2375  
							
						 
						
							2017-07-16 14:29:00 +02:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								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  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								e5021dc9dc 
								
							 
						 
						
							
							
								
								Replace py.builtin.print_() calls by builtin print() function  
							
							 
							
							
							
						 
						
							2017-03-16 22:46:51 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								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  
						
					 
				
					
						
							
							
								 
								Xander Johnson
							
						 
						
							 
							
							
							
							
								
							
							
								dc6890709e 
								
							 
						 
						
							
							
								
								Change ValueError to io.UnsupportedOperation in capture.py. Resolves issue  #2276  
							
							 
							
							
							
						 
						
							2017-03-14 18:55:58 -03:00  
						
					 
				
					
						
							
							
								 
								Bruno Oliveira
							
						 
						
							 
							
							
							
							
								
							
							
								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  
						
					 
				
					
						
							
							
								 
								Anthony Sottile
							
						 
						
							 
							
							
							
							
								
							
							
								6ba3475448 
								
							 
						 
						
							
							
								
								Make capsys more like stdio streams in python3.   Resolves   #1407 .  
							
							 
							
							
							
						 
						
							2017-02-23 17:46:27 -08:00  
						
					 
				
					
						
							
							
								 
								Michal Wajszczuk
							
						 
						
							 
							
							
							
							
								
							
							
								fb0b90646e 
								
							 
						 
						
							
							
								
								New-style classes implemented for python 2.7 -  #2147  
							
							 
							
							
							
						 
						
							2017-02-16 20:28:17 +01:00  
						
					 
				
					
						
							
							
								 
								Ville Skyttä
							
						 
						
							 
							
							
							
							
								
							
							
								ede4e9171f 
								
							 
						 
						
							
							
								
								Spelling fixes  
							
							 
							
							
							
						 
						
							2017-02-15 17:00:58 +02:00  
						
					 
				
					
						
							
							
								 
								Jordan Guymon
							
						 
						
							 
							
							
							
							
								
							
							
								a152ea2dbb 
								
							 
						 
						
							
							
								
								Add buffer attribute to stdin stub  
							
							 
							
							
							
						 
						
							2016-08-24 16:26:34 -07:00