02188e399d 
								
							 
						 
						
							
							
								
								Merge pull request  #4987  from blueyed/collect-tbstyle-repr_failure  
							
							... 
							
							
							
							CollectError.repr_failure: honor explicit tbstyle option 
							
						 
						
							2019-03-26 18:37:49 -03:00  
				
					
						
							
							
								 
						
							
								de44293d59 
								
							 
						 
						
							
							
								
								CollectError.repr_failure: honor explicit tbstyle option  
							
							
							
						 
						
							2019-03-24 11:24:19 +01:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								d32ab6029f 
								
							 
						 
						
							
							
								
								Fix pytest tests invocation with custom PYTHONPATH  
							
							... 
							
							
							
							Fixes https://github.com/pytest-dev/pytest/issues/4913 
Co-authored-by: Bruno Oliveira <nicoddemus@gmail.com> 
							
						 
						
							2019-03-12 17:31:42 +01:00  
				
					
						
							
							
								 
						
							
								0395996756 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into release-4.3.0  
							
							
							
						 
						
							2019-02-16 14:06:51 +00:00  
				
					
						
							
							
								 
						
							
								407d4a0cf0 
								
							 
						 
						
							
							
								
								collect: python: fix `AssertionError` with broken symlinks  
							
							... 
							
							
							
							Fixes https://github.com/pytest-dev/pytest/issues/4782 . 
							
						 
						
							2019-02-14 00:18:14 +01:00  
				
					
						
							
							
								 
						
							
								7b91952645 
								
							 
						 
						
							
							
								
								Merge master into features  
							
							... 
							
							
							
							Conflicts:
	tox.ini 
							
						 
						
							2019-02-13 17:58:16 +01:00  
				
					
						
							
							
								 
						
							
								61b9246afe 
								
							 
						 
						
							
							
								
								Fix/improve handling of pkg init and test file via args  
							
							... 
							
							
							
							Ref: https://github.com/pytest-dev/pytest/issues/4344#issuecomment-441095934  
							
						 
						
							2019-02-11 15:04:24 +01:00  
				
					
						
							
							
								 
						
							
								fc8800c71f 
								
							 
						 
						
							
							
								
								Merge pull request  #4722  from fetzerch/ignore_wildcards  
							
							... 
							
							
							
							Add ability to use globs when using --ignore 
							
						 
						
							2019-02-09 00:11:04 +01:00  
				
					
						
							
							
								 
						
							
								913a2da6e5 
								
							 
						 
						
							
							
								
								Fix handling of collect_ignore from parent conftest  
							
							... 
							
							
							
							`_collectfile` should be called on files only.
Fixes https://github.com/pytest-dev/pytest/issues/4592 . 
							
						 
						
							2019-02-08 18:46:43 +01:00  
				
					
						
							
							
								 
						
							
								2dc2a19db5 
								
							 
						 
						
							
							
								
								Add ability to exclude files matching glob patterns in conftest.py  
							
							... 
							
							
							
							This adds the `collect_ignore_glob` option for `conftest.py` to allow
Unix-style wildcards for excluding files. 
							
						 
						
							2019-02-06 16:49:43 +01:00  
				
					
						
							
							
								 
						
							
								7eb28f9eb7 
								
							 
						 
						
							
							
								
								remove yield tests and compat properties  
							
							
							
						 
						
							2018-11-30 10:40:13 +01:00  
				
					
						
							
							
								 
						
							
								e9b2475e29 
								
							 
						 
						
							
							
								
								Display actual test ids in `--collect-only`  
							
							
							
						 
						
							2018-11-25 09:33:18 -08:00  
				
					
						
							
							
								 
						
							
								a252e81ced 
								
							 
						 
						
							
							
								
								Fix collection of testpaths with `--pyargs`  
							
							... 
							
							
							
							Fixes https://github.com/pytest-dev/pytest/issues/4405 . 
							
						 
						
							2018-11-17 13:28:10 +01:00  
				
					
						
							
							
								 
						
							
								557cb6cffe 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into merge-master-into-features  
							
							
							
						 
						
							2018-11-13 09:01:37 -02:00  
				
					
						
							
							
								 
						
							
								be15ad8d25 
								
							 
						 
						
							
							
								
								Fix collection of direct symlinked files not in python_files  
							
							... 
							
							
							
							Fixes https://github.com/pytest-dev/pytest/issues/4325 . 
							
						 
						
							2018-11-11 01:37:06 +01:00  
				
					
						
							
							
								 
						
							
								ac8b9c6e9d 
								
							 
						 
						
							
							
								
								Node: do not add "::()" to nodeid  
							
							... 
							
							
							
							Fixes https://github.com/pytest-dev/pytest/issues/4127 . 
							
						 
						
							2018-11-10 23:46:41 +01:00  
				
					
						
							
							
								 
						
							
								3137c89cf1 
								
							 
						 
						
							
							
								
								Fix/improve handling of chdir with no-args and testpaths  
							
							... 
							
							
							
							Fixes https://github.com/pytest-dev/pytest/issues/4332 . 
							
						 
						
							2018-11-08 17:50:45 +01:00  
				
					
						
							
							
								 
						
							
								9d838fa861 
								
							 
						 
						
							
							
								
								Merge branch 'master' into features  
							
							... 
							
							
							
							Conflicts:
	src/_pytest/main.py 
							
						 
						
							2018-11-08 02:48:59 +01:00  
				
					
						
							
							
								 
						
							
								f840521854 
								
							 
						 
						
							
							
								
								harden test_collect_init_tests  
							
							
							
						 
						
							2018-11-07 19:29:55 +01:00  
				
					
						
							
							
								 
						
							
								134b103605 
								
							 
						 
						
							
							
								
								XXX: revert _collect_seen_pkgdirs  
							
							
							
						 
						
							2018-11-07 11:01:39 +01:00  
				
					
						
							
							
								 
						
							
								fa35f650b5 
								
							 
						 
						
							
							
								
								Fix handling of duplicate args with regard to Python packages  
							
							... 
							
							
							
							Fixes https://github.com/pytest-dev/pytest/issues/4310 . 
							
						 
						
							2018-11-07 10:06:09 +01:00  
				
					
						
							
							
								 
						
							
								cb57159e01 
								
							 
						 
						
							
							
								
								Handle os.chdir() during collection  
							
							
							
						 
						
							2018-11-05 23:18:47 +01:00  
				
					
						
							
							
								 
						
							
								21725e9304 
								
							 
						 
						
							
							
								
								Merge pull request  #4285  from kchmck/fix-4046  
							
							... 
							
							
							
							Fix problems with running tests in package `__init__` files (#4046 ) 
							
						 
						
							2018-11-02 08:26:07 -03:00  
				
					
						
							
							
								 
						
							
								e30f7094f3 
								
							 
						 
						
							
							
								
								python: collect: ignore exceptions with isinstance  
							
							... 
							
							
							
							Fixes https://github.com/pytest-dev/pytest/issues/4266 . 
							
						 
						
							2018-11-01 22:14:13 +01:00  
				
					
						
							
							
								 
						
							
								320e41b142 
								
							 
						 
						
							
							
								
								Add failing test for __init__.py also including other package files  
							
							
							
						 
						
							2018-11-01 13:10:52 -04:00  
				
					
						
							
							
								 
						
							
								70976b04be 
								
							 
						 
						
							
							
								
								Add test for __init__.py collection with package directory as argument  
							
							
							
						 
						
							2018-11-01 13:10:17 -04:00  
				
					
						
							
							
								 
						
							
								2368fbb63c 
								
							 
						 
						
							
							
								
								Apply reorder-python-imports to all files  
							
							
							
						 
						
							2018-10-25 00:01:29 -07:00  
				
					
						
							
							
								 
						
							
								ac5704290f 
								
							 
						 
						
							
							
								
								Improve error message when it is not possible to determine a function's signature  
							
							... 
							
							
							
							Fix  #4026  
						
							2018-10-18 20:06:43 -03:00  
				
					
						
							
							
								 
						
							
								de6f2c0336 
								
							 
						 
						
							
							
								
								Collect tests from __init__.py files if they match 'python_files'  
							
							... 
							
							
							
							Fix  #3773  
						
							2018-08-25 11:18:52 -03:00  
				
					
						
							
							
								 
						
							
								85482d575e 
								
							 
						 
						
							
							
								
								Replace Source with dedent where possible  
							
							
							
						 
						
							2018-08-23 09:06:17 -07:00  
				
					
						
							
							
								 
						
							
								27b5435a40 
								
							 
						 
						
							
							
								
								Fix docs formatting and improve test a bit  
							
							
							
						 
						
							2018-08-10 18:19:07 -03:00  
				
					
						
							
							
								 
						
							
								50db718a6a 
								
							 
						 
						
							
							
								
								Add a test description.  
							
							
							
						 
						
							2018-08-10 13:57:29 -07:00  
				
					
						
							
							
								 
						
							
								266f05c4c4 
								
							 
						 
						
							
							
								
								Fix   #3751  
							
							
							
						 
						
							2018-08-09 18:28:22 -07:00  
				
					
						
							
							
								 
						
							
								8c9efd8608 
								
							 
						 
						
							
							
								
								Only call _collectfile on package instances  
							
							... 
							
							
							
							As discussed in #3751 , this feels like a hack, pushing it only so we can
see how it fares on CI and if there are better solutions out there 
							
						 
						
							2018-07-31 19:06:30 -03:00  
				
					
						
							
							
								 
						
							
								3c19370cec 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/features' into jonozzz/features  
							
							
							
						 
						
							2018-07-05 18:15:17 -03:00  
				
					
						
							
							
								 
						
							
								cbaa7dd56a 
								
							 
						 
						
							
							
								
								Upgrade pre-commit hooks except pyupgrade  
							
							
							
						 
						
							2018-06-26 06:35:27 -07:00  
				
					
						
							
							
								 
						
							
								3e08c4ee64 
								
							 
						 
						
							
							
								
								sort out flake8 issues and unicode name usage  
							
							
							
						 
						
							2018-05-23 18:12:04 +02:00  
				
					
						
							
							
								 
						
							
								703e4b11ba 
								
							 
						 
						
							
							
								
								run black  
							
							
							
						 
						
							2018-05-23 16:48:46 +02:00  
				
					
						
							
							
								 
						
							
								c02e8d8b0d 
								
							 
						 
						
							
							
								
								Fix test collection when tests are passed as IDs at the command line. Note this is still broken due to  #3358 .  
							
							
							
						 
						
							2018-04-16 11:44:05 -07:00  
				
					
						
							
							
								 
						
							
								2b1410895e 
								
							 
						 
						
							
							
								
								Add package scoped fixtures  #2283  
							
							
							
						 
						
							2018-04-11 15:39:42 -07:00  
				
					
						
							
							
								 
						
							
								bd1d17e8de 
								
							 
						 
						
							
							
								
								Replace py.std with stdlib imports  
							
							
							
						 
						
							2018-01-09 12:44:10 -08:00  
				
					
						
							
							
								 
						
							
								983a09a2d4 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into merge-master-into-features  
							
							
							
						 
						
							2017-11-10 18:33:02 -02:00  
				
					
						
							
							
								 
						
							
								03829fde8a 
								
							 
						 
						
							
							
								
								Fix linting E741: ambiguous variable name  
							
							
							
						 
						
							2017-11-04 13:59:10 -02:00  
				
					
						
							
							
								 
						
							
								6821d36ca5 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into merge-master-into-features  
							
							
							
						 
						
							2017-10-24 19:57:14 -02:00  
				
					
						
							
							
								 
						
							
								c03612f729 
								
							 
						 
						
							
							
								
								Test now looks for real expected output  
							
							
							
						 
						
							2017-10-23 12:40:32 +01:00  
				
					
						
							
							
								 
						
							
								29fa9d5bff 
								
							 
						 
						
							
							
								
								Add failing test  
							
							
							
						 
						
							2017-10-23 12:28:54 +01:00  
				
					
						
							
							
								 
						
							
								00d3abe6dc 
								
							 
						 
						
							
							
								
								Adding Failed exception to manage maxfail behavior  
							
							
							
						 
						
							2017-10-17 21:32:20 +02:00  
				
					
						
							
							
								 
						
							
								d01f08e96f 
								
							 
						 
						
							
							
								
								Merge branch 'features' into pluggy-master  
							
							
							
						 
						
							2017-09-06 13:13:35 -03:00  
				
					
						
							
							
								 
						
							
								7d59b2e350 
								
							 
						 
						
							
							
								
								Fix call to outcome.force_result  
							
							... 
							
							
							
							Even though the test is not running at the moment (xfail), at least
we avoid future confusion 
							
						 
						
							2017-09-05 19:08:20 -03:00