Daniel Hahler
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								8dcee39ce9 
								
							 
						 
						
							
							
								
								Merge pull request  #6103  from blueyed/lsof_check  
							
							 
							
							... 
							
							
							
							tests: lsof_check: include exc with skip message 
							
						 
						
							2019-11-06 18:44:19 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Hahler
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								eb4b3ce1c8 
								
							 
						 
						
							
							
								
								Merge pull request  #6084  from blueyed/merge-rm  
							
							 
							
							... 
							
							
							
							tests: merge/remove test_dontreadfrominput_buffer_python3 
							
						 
						
							2019-11-06 13:24:47 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Hahler
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								6df4d07a57 
								
							 
						 
						
							
							
								
								Merge pull request  #6067  from blueyed/harden-test  
							
							 
							
							... 
							
							
							
							tests: harden test_disabled_capture_fixture 
							
						 
						
							2019-11-02 15:33:55 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Hahler
							
						 
						
							 
							
							
							
							
								
							
							
								8c21416798 
								
							 
						 
						
							
							
								
								lsof_check: include exc with skip message  
							
							 
							
							
							
						 
						
							2019-10-29 15:25:15 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Hahler
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								cdc53da19c 
								
							 
						 
						
							
							
								
								Merge pull request  #5990  from MarcoGorelli/plurality-matching  
							
							 
							
							... 
							
							
							
							Plurality matching 
							
						 
						
							2019-10-28 17:03:15 +01:00  
						
					 
				
					
						
							
							
								 
								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