Bruno Oliveira
							
						 | 
						
							
							
							
							
							
								
							
							
								0395996756
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into release-4.3.0
							
							
							
							
							
						 | 
						
							2019-02-16 14:06:51 +00:00 | 
						
					
				
					
						
							
							
								 
								Daniel Hahler
							
						 | 
						
							
							
							
							
							
								
							
							
								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 | 
						
					
				
					
						
							
							
								 
								Daniel Hahler
							
						 | 
						
							
							
							
							
							
								
							
							
								7b91952645
								
							
						 | 
						
							
							
								
								Merge master into features
							
							
							
							
							
							
							
							Conflicts:
	tox.ini 
							
						 | 
						
							2019-02-13 17:58:16 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Hahler
							
						 | 
						
							
							
							
							
							
								
							
							
								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 | 
						
					
				
					
						
							
							
								 
								Daniel Hahler
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								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 | 
						
					
				
					
						
							
							
								 
								Daniel Hahler
							
						 | 
						
							
							
							
							
							
								
							
							
								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 | 
						
					
				
					
						
							
							
								 
								Christian Fetzer
							
						 | 
						
							
							
							
							
							
								
							
							
								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 | 
						
					
				
					
						
							
							
								 
								Ronny Pfannschmidt
							
						 | 
						
							
							
							
							
							
								
							
							
								7eb28f9eb7
								
							
						 | 
						
							
							
								
								remove yield tests and compat properties
							
							
							
							
							
						 | 
						
							2018-11-30 10:40:13 +01:00 | 
						
					
				
					
						
							
							
								 
								Anthony Sottile
							
						 | 
						
							
							
							
							
							
								
							
							
								e9b2475e29
								
							
						 | 
						
							
							
								
								Display actual test ids in `--collect-only`
							
							
							
							
							
						 | 
						
							2018-11-25 09:33:18 -08:00 | 
						
					
				
					
						
							
							
								 
								Daniel Hahler
							
						 | 
						
							
							
							
							
							
								
							
							
								a252e81ced
								
							
						 | 
						
							
							
								
								Fix collection of testpaths with `--pyargs`
							
							
							
							
							
							
							
							Fixes https://github.com/pytest-dev/pytest/issues/4405. 
							
						 | 
						
							2018-11-17 13:28:10 +01:00 | 
						
					
				
					
						
							
							
								 
								Bruno Oliveira
							
						 | 
						
							
							
							
							
							
								
							
							
								557cb6cffe
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into merge-master-into-features
							
							
							
							
							
						 | 
						
							2018-11-13 09:01:37 -02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Hahler
							
						 | 
						
							
							
							
							
							
								
							
							
								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 | 
						
					
				
					
						
							
							
								 
								Daniel Hahler
							
						 | 
						
							
							
							
							
							
								
							
							
								ac8b9c6e9d
								
							
						 | 
						
							
							
								
								Node: do not add "::()" to nodeid
							
							
							
							
							
							
							
							Fixes https://github.com/pytest-dev/pytest/issues/4127. 
							
						 | 
						
							2018-11-10 23:46:41 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Hahler
							
						 | 
						
							
							
							
							
							
								
							
							
								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 | 
						
					
				
					
						
							
							
								 
								Daniel Hahler
							
						 | 
						
							
							
							
							
							
								
							
							
								9d838fa861
								
							
						 | 
						
							
							
								
								Merge branch 'master' into features
							
							
							
							
							
							
							
							Conflicts:
	src/_pytest/main.py 
							
						 | 
						
							2018-11-08 02:48:59 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Hahler
							
						 | 
						
							
							
							
							
							
								
							
							
								f840521854
								
							
						 | 
						
							
							
								
								harden test_collect_init_tests
							
							
							
							
							
						 | 
						
							2018-11-07 19:29:55 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Hahler
							
						 | 
						
							
							
							
							
							
								
							
							
								134b103605
								
							
						 | 
						
							
							
								
								XXX: revert _collect_seen_pkgdirs
							
							
							
							
							
						 | 
						
							2018-11-07 11:01:39 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Hahler
							
						 | 
						
							
							
							
							
							
								
							
							
								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 | 
						
					
				
					
						
							
							
								 
								Daniel Hahler
							
						 | 
						
							
							
							
							
							
								
							
							
								cb57159e01
								
							
						 | 
						
							
							
								
								Handle os.chdir() during collection
							
							
							
							
							
						 | 
						
							2018-11-05 23:18:47 +01:00 | 
						
					
				
					
						
							
							
								 
								Bruno Oliveira
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								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 | 
						
					
				
					
						
							
							
								 
								Daniel Hahler
							
						 | 
						
							
							
							
							
							
								
							
							
								e30f7094f3
								
							
						 | 
						
							
							
								
								python: collect: ignore exceptions with isinstance
							
							
							
							
							
							
							
							Fixes https://github.com/pytest-dev/pytest/issues/4266. 
							
						 | 
						
							2018-11-01 22:14:13 +01:00 | 
						
					
				
					
						
							
							
								 
								Mick Koch
							
						 | 
						
							
							
							
							
							
								
							
							
								320e41b142
								
							
						 | 
						
							
							
								
								Add failing test for __init__.py also including other package files
							
							
							
							
							
						 | 
						
							2018-11-01 13:10:52 -04:00 | 
						
					
				
					
						
							
							
								 
								Mick Koch
							
						 | 
						
							
							
							
							
							
								
							
							
								70976b04be
								
							
						 | 
						
							
							
								
								Add test for __init__.py collection with package directory as argument
							
							
							
							
							
						 | 
						
							2018-11-01 13:10:17 -04:00 | 
						
					
				
					
						
							
							
								 
								Anthony Sottile
							
						 | 
						
							
							
							
							
							
								
							
							
								2368fbb63c
								
							
						 | 
						
							
							
								
								Apply reorder-python-imports to all files
							
							
							
							
							
						 | 
						
							2018-10-25 00:01:29 -07:00 | 
						
					
				
					
						
							
							
								 
								Bruno Oliveira
							
						 | 
						
							
							
							
							
							
								
							
							
								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 | 
						
					
				
					
						
							
							
								 
								Bruno Oliveira
							
						 | 
						
							
							
							
							
							
								
							
							
								de6f2c0336
								
							
						 | 
						
							
							
								
								Collect tests from __init__.py files if they match 'python_files'
							
							
							
							
							
							
							
							Fix #3773 
							
						 | 
						
							2018-08-25 11:18:52 -03:00 | 
						
					
				
					
						
							
							
								 
								Anthony Sottile
							
						 | 
						
							
							
							
							
							
								
							
							
								85482d575e
								
							
						 | 
						
							
							
								
								Replace Source with dedent where possible
							
							
							
							
							
						 | 
						
							2018-08-23 09:06:17 -07:00 | 
						
					
				
					
						
							
							
								 
								Bruno Oliveira
							
						 | 
						
							
							
							
							
							
								
							
							
								27b5435a40
								
							
						 | 
						
							
							
								
								Fix docs formatting and improve test a bit
							
							
							
							
							
						 | 
						
							2018-08-10 18:19:07 -03:00 | 
						
					
				
					
						
							
							
								 
								turturica
							
						 | 
						
							
							
							
							
							
								
							
							
								50db718a6a
								
							
						 | 
						
							
							
								
								Add a test description.
							
							
							
							
							
						 | 
						
							2018-08-10 13:57:29 -07:00 | 
						
					
				
					
						
							
							
								 
								turturica
							
						 | 
						
							
							
							
							
							
								
							
							
								266f05c4c4
								
							
						 | 
						
							
							
								
								Fix #3751
							
							
							
							
							
						 | 
						
							2018-08-09 18:28:22 -07:00 | 
						
					
				
					
						
							
							
								 
								Bruno Oliveira
							
						 | 
						
							
							
							
							
							
								
							
							
								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 | 
						
					
				
					
						
							
							
								 
								Bruno Oliveira
							
						 | 
						
							
							
							
							
							
								
							
							
								3c19370cec
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'upstream/features' into jonozzz/features
							
							
							
							
							
						 | 
						
							2018-07-05 18:15:17 -03:00 | 
						
					
				
					
						
							
							
								 
								Anthony Sottile
							
						 | 
						
							
							
							
							
							
								
							
							
								cbaa7dd56a
								
							
						 | 
						
							
							
								
								Upgrade pre-commit hooks except pyupgrade
							
							
							
							
							
						 | 
						
							2018-06-26 06:35:27 -07: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 | 
						
					
				
					
						
							
							
								 
								turturica
							
						 | 
						
							
							
							
							
							
								
							
							
								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 | 
						
					
				
					
						
							
							
								 
								turturica
							
						 | 
						
							
							
							
							
							
								
							
							
								2b1410895e
								
							
						 | 
						
							
							
								
								Add package scoped fixtures #2283
							
							
							
							
							
						 | 
						
							2018-04-11 15:39:42 -07:00 | 
						
					
				
					
						
							
							
								 
								Anthony Sottile
							
						 | 
						
							
							
							
							
							
								
							
							
								bd1d17e8de
								
							
						 | 
						
							
							
								
								Replace py.std with stdlib imports
							
							
							
							
							
						 | 
						
							2018-01-09 12:44:10 -08:00 | 
						
					
				
					
						
							
							
								 
								Bruno Oliveira
							
						 | 
						
							
							
							
							
							
								
							
							
								983a09a2d4
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into merge-master-into-features
							
							
							
							
							
						 | 
						
							2017-11-10 18:33:02 -02:00 | 
						
					
				
					
						
							
							
								 
								Bruno Oliveira
							
						 | 
						
							
							
							
							
							
								
							
							
								03829fde8a
								
							
						 | 
						
							
							
								
								Fix linting E741: ambiguous variable name
							
							
							
							
							
						 | 
						
							2017-11-04 13:59:10 -02:00 | 
						
					
				
					
						
							
							
								 
								Bruno Oliveira
							
						 | 
						
							
							
							
							
							
								
							
							
								6821d36ca5
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into merge-master-into-features
							
							
							
							
							
						 | 
						
							2017-10-24 19:57:14 -02:00 | 
						
					
				
					
						
							
							
								 
								Tom Dalton
							
						 | 
						
							
							
							
							
							
								
							
							
								c03612f729
								
							
						 | 
						
							
							
								
								Test now looks for real expected output
							
							
							
							
							
						 | 
						
							2017-10-23 12:40:32 +01:00 | 
						
					
				
					
						
							
							
								 
								Tom Dalton
							
						 | 
						
							
							
							
							
							
								
							
							
								29fa9d5bff
								
							
						 | 
						
							
							
								
								Add failing test
							
							
							
							
							
						 | 
						
							2017-10-23 12:28:54 +01:00 | 
						
					
				
					
						
							
							
								 
								Jesús Espino
							
						 | 
						
							
							
							
							
							
								
							
							
								00d3abe6dc
								
							
						 | 
						
							
							
								
								Adding Failed exception to manage maxfail behavior
							
							
							
							
							
						 | 
						
							2017-10-17 21:32:20 +02:00 | 
						
					
				
					
						
							
							
								 
								Bruno Oliveira
							
						 | 
						
							
							
							
							
							
								
							
							
								d01f08e96f
								
							
						 | 
						
							
							
								
								Merge branch 'features' into pluggy-master
							
							
							
							
							
						 | 
						
							2017-09-06 13:13:35 -03:00 | 
						
					
				
					
						
							
							
								 
								Bruno Oliveira
							
						 | 
						
							
							
							
							
							
								
							
							
								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 | 
						
					
				
					
						
							
							
								 
								Tarcisio Fischer
							
						 | 
						
							
							
							
							
							
								
							
							
								8d1903fed3
								
							
						 | 
						
							
							
								
								Avoid creating arbitrary filenames for tmpdir on Testdir's constructor
							
							
							
							
							
							
							
							Fixes #2751 
							
						 | 
						
							2017-09-05 15:22:04 -03:00 | 
						
					
				
					
						
							
							
								 
								Bruno Oliveira
							
						 | 
						
							
							
							
							
							
								
							
							
								3dc0da9339
								
							
						 | 
						
							
							
								
								Remove __multicall__ warning and usages in testing
							
							
							
							
							
							
							
							pluggy>=0.5 already warns about those 
							
						 | 
						
							2017-09-01 18:53:06 -03:00 | 
						
					
				
					
						
							
							
								 
								Bruno Oliveira
							
						 | 
						
							
							
							
							
							
								
							
							
								26ee2355d9
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'upstream/features' into fix-flake8-errors
							
							
							
							
							
						 | 
						
							2017-07-19 17:09:05 -03:00 | 
						
					
				
					
						
							
							
								 
								Andras Tim
							
						 | 
						
							
							
							
							
							
								
							
							
								45ac863069
								
							
						 | 
						
							
							
								
								Fixed E401 flake8 errors
							
							
							
							
							
							
							
							multiple imports on one line 
							
						 | 
						
							2017-07-17 01:44:23 +02:00 |