450409d123 
								
							 
						 
						
							
							
								
								Merge master into features  
							
							... 
							
							
							
							Conflicts:
	src/_pytest/reports.py
        (via 7259c453d3c82b1cb9 
							
						 
						
							2019-09-17 12:46:36 +02:00  
				
					
						
							
							
								 
						
							
								702acdba46 
								
							 
						 
						
							
							
								
								Merge pull request  #5811  from blueyed/fulltrace-pytest-raises  
							
							... 
							
							
							
							Handle --fulltrace with pytest.raises 
							
						 
						
							2019-09-14 02:09:36 +02:00  
				
					
						
							
							
								 
						
							
								f832ac3316 
								
							 
						 
						
							
							
								
								Handle --fulltrace with pytest.raises  
							
							... 
							
							
							
							This changes `_repr_failure_py` to use `tbfilter=False` always. 
							
						 
						
							2019-09-14 01:41:43 +02:00  
				
					
						
							
							
								 
						
							
								b48f51eb03 
								
							 
						 
						
							
							
								
								Use Path() objects to store conftest files  
							
							... 
							
							
							
							Using Path().resolve() is better than py.path.realpath because
it resolves to the correct path/drive in case-insensitive file systems (#5792 ):
>>> from py.path import local
>>> from pathlib import Path
>>>
>>> local('d:\\projects').realpath()
local('d:\\projects')
>>> Path('d:\\projects').resolve()
WindowsPath('D:/projects')
Fix  #5819  
							
						 
						
							2019-09-12 08:05:50 -03:00  
				
					
						
							
							
								 
						
							
								cf5b544db3 
								
							 
						 
						
							
							
								
								Revert "Merge pull request  #5792  from dynatrace-oss-contrib/bugfix/badcase"  
							
							... 
							
							
							
							This reverts commit 955e5422100215bcd84e 
							
						 
						
							2019-09-12 08:05:43 -03:00  
				
					
						
							
							
								 
						
							
								d049b35397 
								
							 
						 
						
							
							
								
								Fix for Python 4: replace unsafe PY3 with PY2  
							
							
							
						 
						
							2019-09-05 18:06:47 +03:00  
				
					
						
							
							
								 
						
							
								f8dd6349c1 
								
							 
						 
						
							
							
								
								Fix "lexer" being used when uploading to bpaste.net  
							
							... 
							
							
							
							Closes  #5806 . 
						
							2019-08-30 15:34:03 -04:00  
				
					
						
							
							
								 
						
							
								bd57307a39 
								
							 
						 
						
							
							
								
								Merge pull request  #5768  from robholt/fixture-class-instance  
							
							... 
							
							
							
							Fix self reference in function scoped fixtures 
							
						 
						
							2019-08-30 12:31:16 -03:00  
				
					
						
							
							
								 
						
							
								4e594552eb 
								
							 
						 
						
							
							
								
								Merge pull request  #5798  from aklajnert/570-indirect-fixtures  
							
							... 
							
							
							
							Fix the scope behavior with indirect fixtures 
							
						 
						
							2019-08-30 12:29:03 -03:00  
				
					
						
							
							
								 
						
							
								955dc6d18a 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into robholt/fixture-class-instance  
							
							
							
						 
						
							2019-08-30 11:21:33 -03:00  
				
					
						
							
							
								 
						
							
								3ddbc7fb2a 
								
							 
						 
						
							
							
								
								Improve CHANGELOG and add some comments  
							
							... 
							
							
							
							Ref: #5768  
							
						 
						
							2019-08-30 11:20:19 -03:00  
				
					
						
							
							
								 
						
							
								35b3b1097f 
								
							 
						 
						
							
							
								
								Improve CHANGELOG and make test easier to understand for  #570  
							
							
							
						 
						
							2019-08-30 10:54:58 -03:00  
				
					
						
							
							
								 
						
							
								01082fea12 
								
							 
						 
						
							
							
								
								Serialize/deserialize chained exceptions ( #5787 )  
							
							... 
							
							
							
							Serialize/deserialize chained exceptions 
							
						 
						
							2019-08-30 07:29:48 -03:00  
				
					
						
							
							
								 
						
							
								a511b98da9 
								
							 
						 
						
							
							
								
								Serialize/deserialize chained exceptions  
							
							... 
							
							
							
							Fix  #5786  
						
							2019-08-29 20:23:44 -03:00  
				
					
						
							
							
								 
						
							
								487659d8b1 
								
							 
						 
						
							
							
								
								Fix the scope behavior with indirect fixtures.  
							
							
							
						 
						
							2019-08-29 07:23:08 +02:00  
				
					
						
							
							
								 
						
							
								29bb0eda27 
								
							 
						 
						
							
							
								
								Move _uniquepath to pathlib as unique_path.  
							
							... 
							
							
							
							Co-authored-by: Bruno Oliveira <nicoddemus@gmail.com> 
							
						 
						
							2019-08-28 12:29:41 +02:00  
				
					
						
							
							
								 
						
							
								1aac64573f 
								
							 
						 
						
							
							
								
								black formatting.  
							
							
							
						 
						
							2019-08-27 16:16:45 +02:00  
				
					
						
							
							
								 
						
							
								d47b9d04d4 
								
							 
						 
						
							
							
								
								Gracefully handle HTTP errors from pastebin  
							
							... 
							
							
							
							We find that the --pastebin option to pytest sometimes fails with "HTTP
Error 400: Bad Request". We're still investigating the exact cause of
these errors, but in the meantime, a failure to upload to the pastebin
service should probably not crash pytest and cause a test failure in the
continuous-integration.
This patch catches exceptions like HTTPError that may be thrown while
trying to communicate with the pastebin service, and reports them as a
"bad response", without crashing with a backtrace or failing the entire
test suite. 
							
						 
						
							2019-08-26 23:50:46 -04:00  
				
					
						
							
							
								 
						
							
								c28e428249 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into mm  
							
							
							
						 
						
							2019-08-26 20:00:30 -03:00  
				
					
						
							
							
								 
						
							
								505c3340bf 
								
							 
						 
						
							
							
								
								Fix pytest with mixed up filename casing.  
							
							
							
						 
						
							2019-08-26 17:18:46 +02:00  
				
					
						
							
							
								 
						
							
								7a69365486 
								
							 
						 
						
							
							
								
								Move TWMock class to a fixture  
							
							... 
							
							
							
							Using a relative import like before was not very nice 
							
						 
						
							2019-08-26 11:32:57 -03:00  
				
					
						
							
							
								 
						
							
								691c706fcc 
								
							 
						 
						
							
							
								
								Add test for  #5782  
							
							
							
						 
						
							2019-08-24 14:41:06 -03:00  
				
					
						
							
							
								 
						
							
								daff9066c0 
								
							 
						 
						
							
							
								
								Merge pull request  #5752  from bluetech/typing-py350-fix  
							
							... 
							
							
							
							Fix TypeError when importing pytest on Python 3.5.0 and 3.5.1 
							
						 
						
							2019-08-20 08:04:58 -07:00  
				
					
						
							
							
								 
						
							
								43eab917a1 
								
							 
						 
						
							
							
								
								Fix coverage  
							
							
							
						 
						
							2019-08-20 15:41:32 +03:00  
				
					
						
							
							
								 
						
							
								a7c235732a 
								
							 
						 
						
							
							
								
								Pypy doesn't have sys.getrefcount(), so go back to gc  
							
							
							
						 
						
							2019-08-20 11:47:22 +03:00  
				
					
						
							
							
								 
						
							
								cec2183aeb 
								
							 
						 
						
							
							
								
								Add workaround for test_raises_cyclic_reference in Python 3.5.{0,1}  
							
							
							
						 
						
							2019-08-20 11:19:25 +03:00  
				
					
						
							
							
								 
						
							
								62381125e7 
								
							 
						 
						
							
							
								
								Fix self reference in function scoped fixtures  
							
							
							
						 
						
							2019-08-19 15:57:39 -04:00  
				
					
						
							
							
								 
						
							
								e5f4c47cd5 
								
							 
						 
						
							
							
								
								test_assertion: minor cleanup  
							
							
							
						 
						
							2019-08-17 21:38:52 +02:00  
				
					
						
							
							
								 
						
							
								05bfe73cf9 
								
							 
						 
						
							
							
								
								Fix wrong location of assertion error with coverage.py  
							
							... 
							
							
							
							Reverts using-constant part from 39ba99613https://github.com/pytest-dev/pytest/issues/5754 . 
							
						 
						
							2019-08-17 21:34:13 +02:00  
				
					
						
							
							
								 
						
							
								2a6a1ca07d 
								
							 
						 
						
							
							
								
								Inject width via pylib to argparse formatter  
							
							... 
							
							
							
							`argparse.HelpFormatter` looks at `$COLUMNS` only, falling back to a
default of 80.
`py.io.get_terminal_width()` is smarter there, and could even work
better with https://github.com/pytest-dev/py/pull/219 .
This ensures to use a consistent value for formatting the ini values etc. 
							
						 
						
							2019-08-17 16:51:02 +02:00  
				
					
						
							
							
								 
						
							
								8ccc0177c8 
								
							 
						 
						
							
							
								
								Release 5.1.0 ( #5748 )  
							
							... 
							
							
							
							Release 5.1.0 
							
						 
						
							2019-08-15 22:35:59 -03:00  
				
					
						
							
							
								 
						
							
								6ead01aacd 
								
							 
						 
						
							
							
								
								testing/python/fixtures.py: use NotImplementedError pattern  
							
							
							
						 
						
							2019-08-16 01:14:19 +02:00  
				
					
						
							
							
								 
						
							
								d7f082519a 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into mm  
							
							... 
							
							
							
							Conflicts:
	src/_pytest/outcomes.py 
							
						 
						
							2019-08-15 10:03:52 -03:00  
				
					
						
							
							
								 
						
							
								2d613a03b3 
								
							 
						 
						
							
							
								
								Async result warn ( #5742 )  
							
							... 
							
							
							
							Async result warn 
							
						 
						
							2019-08-15 09:47:56 -03:00  
				
					
						
							
							
								 
						
							
								28c6c5bb71 
								
							 
						 
						
							
							
								
								check that tests that are partial staticmethods are supported ( #5701 )  
							
							... 
							
							
							
							check that tests that are partial staticmethods are supported 
							
						 
						
							2019-08-15 09:12:01 -03:00  
				
					
						
							
							
								 
						
							
								6b9d729ed3 
								
							 
						 
						
							
							
								
								also warn on awaitable or async iterable test results  
							
							
							
						 
						
							2019-08-15 12:30:44 +01:00  
				
					
						
							
							
								 
						
							
								0ba774a7c3 
								
							 
						 
						
							
							
								
								warn for async generator functions ( #5734 )  
							
							... 
							
							
							
							warn for async generator functions 
							
						 
						
							2019-08-15 08:17:12 -03:00  
				
					
						
							
							
								 
						
							
								137255816e 
								
							 
						 
						
							
							
								
								Fix collection of staticmethods defined with functools.partial  
							
							... 
							
							
							
							Related to #5701  
							
						 
						
							2019-08-15 08:04:05 -03:00  
				
					
						
							
							
								 
						
							
								2f1b192fe6 
								
							 
						 
						
							
							
								
								Issue a warning for async gen functions  
							
							... 
							
							
							
							Co-Authored-By: Bruno Oliveira <nicoddemus@gmail.com> 
							
						 
						
							2019-08-15 07:54:10 -03:00  
				
					
						
							
							
								 
						
							
								7183335e62 
								
							 
						 
						
							
							
								
								Capture warnings during ``pytest_configure``  
							
							... 
							
							
							
							Fix  #5115  
						
							2019-08-15 07:50:27 -03:00  
				
					
						
							
							
								 
						
							
								cb481a354a 
								
							 
						 
						
							
							
								
								assertrepr_compare: prefer same maxsize  
							
							... 
							
							
							
							Previously it would say:
    > assert '123456789012...901234567890A' == '1234567890123...901234567890B'"
This makes it look like the "3" might be different already.
This is clearer, and it is OK to have potentially one less char in the
right one:
    > assert '123456789012...901234567890A' == '123456789012...901234567890B'" 
							
						 
						
							2019-08-12 03:41:14 +02:00  
				
					
						
							
							
								 
						
							
								300f78556f 
								
							 
						 
						
							
							
								
								Show session duration in human-readable format ( #5721 )  
							
							... 
							
							
							
							Show session duration in human-readable format 
							
						 
						
							2019-08-10 23:05:34 -03:00  
				
					
						
							
							
								 
						
							
								0db9dade65 
								
							 
						 
						
							
							
								
								test_non_ascii_paste_text: mock call to urlopen  
							
							... 
							
							
							
							Likely to fix flaky coverage due to requests failing sometimes.
Ref: f7e81dab9a...83a1f4bd66 
							
						 
						
							2019-08-10 23:30:49 +02:00  
				
					
						
							
							
								 
						
							
								345df99db7 
								
							 
						 
						
							
							
								
								Show session duration in human-readable format  
							
							... 
							
							
							
							Fix  #5707  
						
							2019-08-10 10:45:53 -03:00  
				
					
						
							
							
								 
						
							
								2f065a555f 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into release-5.1.0  
							
							
							
						 
						
							2019-08-09 12:36:19 -03:00  
				
					
						
							
							
								 
						
							
								ba72b480b9 
								
							 
						 
						
							
							
								
								Remove xfail marker from test_runs_twice_xdist  
							
							... 
							
							
							
							Apperently it does not hang, let's see how it fares on CI 
							
						 
						
							2019-08-09 10:55:06 -03:00  
				
					
						
							
							
								 
						
							
								ba76080b59 
								
							 
						 
						
							
							
								
								Validate xunit2 files against the schema  
							
							... 
							
							
							
							Fix  #5095  
						
							2019-08-09 10:55:06 -03:00  
				
					
						
							
							
								 
						
							
								ef0915e1db 
								
							 
						 
						
							
							
								
								fix grammar in test_collect_functools_partial docstr  
							
							
							
						 
						
							2019-08-06 15:27:36 +01:00  
				
					
						
							
							
								 
						
							
								aa06e6c8f3 
								
							 
						 
						
							
							
								
								Merge master into features  
							
							
							
						 
						
							2019-08-05 19:12:32 +02:00  
				
					
						
							
							
								 
						
							
								198fcd8a6f 
								
							 
						 
						
							
							
								
								Fix RuntimeError when trying to collect package with "__init__.py" only  
							
							... 
							
							
							
							Fixes https://github.com/pytest-dev/pytest/issues/4344 . 
							
						 
						
							2019-08-05 17:52:21 +02:00