7cd7c283dd 
								
							 
						 
						
							
							
								
								Refactor plugin specs handling into an isolated function  
							
							
							
						 
						
							2017-01-12 14:31:35 -02:00  
				
					
						
							
							
								 
						
							
								0bb8a4a36d 
								
							 
						 
						
							
							
								
								Fixed   #2148  - parse directory names properly when args contains ::.  
							
							... 
							
							
							
							This commit also improves readbility in get_dirs_from_args by using self
documenting local functions.
get_dirs_from_args also now only returns directories that actually exists,
and not files to avoid confusion.
This commit also removes redundant checks in get_common_ancestor that
was already performed in get_dirs_from_args.. 
							
						 
						
							2016-12-27 15:28:56 +01:00  
				
					
						
							
							
								 
						
							
								c856537e71 
								
							 
						 
						
							
							
								
								Add warning for incorrect passing args to `-o`.  
							
							
							
						 
						
							2016-12-01 13:20:42 +01:00  
				
					
						
							
							
								 
						
							
								629d8e9fd6 
								
							 
						 
						
							
							
								
								Show an error if --confcutdir is not a valid directory  
							
							... 
							
							
							
							Fixes  #2078  
						
							2016-11-23 09:49:11 -02:00  
				
					
						
							
							
								 
						
							
								1eb5a690d4 
								
							 
						 
						
							
							
								
								Fix flake8 E305 and E306 errors  
							
							... 
							
							
							
							These errors started to appear with flake8-3.1.1, while they don't appear with
version 3.1.0 (weird). 
							
						 
						
							2016-11-20 18:59:15 -02:00  
				
					
						
							
							
								 
						
							
								463e6572c5 
								
							 
						 
						
							
							
								
								Merge branch 'master' into merge-master-into-features  
							
							... 
							
							
							
							Preparing for 3.0 
							
						 
						
							2016-08-17 22:39:23 -03:00  
				
					
						
							
							
								 
						
							
								224ef67374 
								
							 
						 
						
							
							
								
								Quick fix for tests in config depended on the current directory  
							
							... 
							
							
							
							When running those tests from pytest's root folder, they would
fail because they would end up picking pytest's own pytest.ini 
							
						 
						
							2016-08-17 21:32:05 -03:00  
				
					
						
							
							
								 
						
							
								ab86dea529 
								
							 
						 
						
							
							
								
								Support [tool:pytest] in setup.cfg files  
							
							... 
							
							
							
							Also deprecate [pytest] usage in setup.cfg files
Fix  #567  
							
						 
						
							2016-08-17 08:19:38 -03:00  
				
					
						
							
							
								 
						
							
								16cb5d01b1 
								
							 
						 
						
							
							
								
								Fix off-by-one error with lines from request.node.warn  
							
							... 
							
							
							
							The line numbers in `node.location` seem to be zero-based?! 
							
						 
						
							2016-08-14 22:10:01 +02:00  
				
					
						
							
							
								 
						
							
								802755ceed 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into merge-master-into-features  
							
							
							
						 
						
							2016-08-06 17:58:17 -03:00  
				
					
						
							
							
								 
						
							
								a2891420de 
								
							 
						 
						
							
							
								
								Fix determining rootdir from common_ancestor  
							
							
							
						 
						
							2016-08-06 19:35:40 +02:00  
				
					
						
							
							
								 
						
							
								5c5d7e05f7 
								
							 
						 
						
							
							
								
								Followup to  #1718 : style/formatting  
							
							
							
						 
						
							2016-07-24 00:21:42 +02:00  
				
					
						
							
							
								 
						
							
								24fbbbef1f 
								
							 
						 
						
							
							
								
								Merge pull request  #1641  from flub/rewrite-plugins  
							
							... 
							
							
							
							Rewrite plugins 
							
						 
						
							2016-07-14 19:39:15 +01:00  
				
					
						
							
							
								 
						
							
								51ee7f8734 
								
							 
						 
						
							
							
								
								Fixup things after rebase  
							
							... 
							
							
							
							Some changes to make things work on top of current features branch. 
							
						 
						
							2016-07-14 12:42:29 +01:00  
				
					
						
							
							
								 
						
							
								1266ebec83 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/features' into warnings-displayed-by-default  
							
							... 
							
							
							
							# Conflicts:
#	CHANGELOG.rst
#	testing/test_terminal.py 
							
						 
						
							2016-07-13 18:45:15 -03:00  
				
					
						
							
							
								 
						
							
								a98e3cefc5 
								
							 
						 
						
							
							
								
								Enable re-writing of setuptools-installed plugins  
							
							... 
							
							
							
							Hook up the PEP 302 import hook very early in pytest startup so
that it gets installed before setuptools-installed plugins are
imported.  Also iterate over all installed plugins and mark them
for rewriting.  If an installed plugin is already imported then
a warning is issued, we can not break since that might break
existing plugins and the fallback will still be gracefull to
plain asserts.
Some existing tests are failing in this commit because of the new
warning triggered by inline pytest runs due to the hypothesis
plugin already being imported.  The tests will be fixed in the next
commit. 
							
						 
						
							2016-07-13 17:29:19 +01:00  
				
					
						
							
							
								 
						
							
								b9a91dc112 
								
							 
						 
						
							
							
								
								merge from master to features  
							
							
							
						 
						
							2016-07-06 11:51:48 +02:00  
				
					
						
							
							
								 
						
							
								94e4a2dd67 
								
							 
						 
						
							
							
								
								* implemented changes recommended by nicoddemus  
							
							
							
						 
						
							2016-07-05 15:22:27 +02:00  
				
					
						
							
							
								 
						
							
								0e2ebc96ff 
								
							 
						 
						
							
							
								
								Remove deprecated cmd options  
							
							... 
							
							
							
							Fixes  #1657  
						
							2016-06-26 19:26:04 +02:00  
				
					
						
							
							
								 
						
							
								e04d9ff80b 
								
							 
						 
						
							
							
								
								* now showing pytest warnings summary by default.  
							
							... 
							
							
							
							* added ``--disable-pytest-warnings` flag to let users disable the warnings summary.
* extended/changed unit tests for the changes in the pytest core. 
							
						 
						
							2016-06-25 18:16:13 +02:00  
				
					
						
							
							
								 
						
							
								856e6cab75 
								
							 
						 
						
							
							
								
								add --override-ini option to overrides ini values  
							
							... 
							
							
							
							Signed-off-by: Ted Xiao <xiao.xj@gmail.com> 
							
						 
						
							2016-06-25 23:45:32 +08:00  
				
					
						
							
							
								 
						
							
								757f37f445 
								
							 
						 
						
							
							
								
								Don't ignore ImportError with setuptools plugins  
							
							... 
							
							
							
							This was added in b2d66b9e7bFixes  #1479 , also see #1307  and #1497  
							
						 
						
							2016-06-25 09:56:22 +02:00  
				
					
						
							
							
								 
						
							
								4350f499b2 
								
							 
						 
						
							
							
								
								Merge branch 'issue1629' of  https://github.com/davehunt/pytest  into features  
							
							
							
						 
						
							2016-06-21 18:37:14 +02:00  
				
					
						
							
							
								 
						
							
								ef9dd14963 
								
							 
						 
						
							
							
								
								Introduce pytest command as recommended entry point  
							
							... 
							
							
							
							Fixes  #1629  
						
							2016-06-21 16:16:57 +02:00  
				
					
						
							
							
								 
						
							
								3a81d2e012 
								
							 
						 
						
							
							
								
								conftest files now use assertion rewriting  
							
							... 
							
							
							
							Fix  #1619  
						
							2016-06-20 23:13:29 +02:00  
				
					
						
							
							
								 
						
							
								1a37035d71 
								
							 
						 
						
							
							
								
								Add test test_absolute_win32_path  
							
							
							
						 
						
							2016-04-20 01:27:37 +08:00  
				
					
						
							
							
								 
						
							
								a965386b9e 
								
							 
						 
						
							
							
								
								Add bool type to addini  
							
							
							
						 
						
							2016-02-14 20:52:27 -02:00  
				
					
						
							
							
								 
						
							
								a912d3745b 
								
							 
						 
						
							
							
								
								Moved py.code code over to py.test  
							
							... 
							
							
							
							Fix  #103  
						
							2016-01-25 23:18:04 -02:00  
				
					
						
							
							
								 
						
							
								67236d6de3 
								
							 
						 
						
							
							
								
								strengthen the ini assertion  
							
							
							
						 
						
							2015-10-09 09:58:12 -07:00  
				
					
						
							
							
								 
						
							
								0e55a8793f 
								
							 
						 
						
							
							
								
								all tests pass  
							
							
							
						 
						
							2015-10-09 09:58:12 -07:00  
				
					
						
							
							
								 
						
							
								49d46a0059 
								
							 
						 
						
							
							
								
								an ugly patch to fix all but the most important part =/  
							
							
							
						 
						
							2015-10-08 10:44:58 -07:00  
				
					
						
							
							
								 
						
							
								616d8251f3 
								
							 
						 
						
							
							
								
								unit tests of Config.fromdictargs. currently failing  
							
							
							
						 
						
							2015-10-08 10:44:58 -07:00  
				
					
						
							
							
								 
						
							
								e59471766a 
								
							 
						 
						
							
							
								
								Rename "warnings" to "pytest-warnings" in terminal output  
							
							... 
							
							
							
							Fix  #970  
						
							2015-08-27 19:59:52 -03:00  
				
					
						
							
							
								 
						
							
								42b43a7d7b 
								
							 
						 
						
							
							
								
								Paths after normal options are now properly used to discover rootdir and ini files  
							
							... 
							
							
							
							Fix  #949  
						
							2015-08-25 22:08:05 -03:00  
				
					
						
							
							
								 
						
							
								2ffd37b816 
								
							 
						 
						
							
							
								
								return non-zero exit code if no tests are collected  
							
							... 
							
							
							
							Fix  #812 
Fix  #500  
						
							2015-08-18 07:35:02 -03:00  
				
					
						
							
							
								 
						
							
								8a6aa5e17e 
								
							 
						 
						
							
							
								
								Print inifile and rootdir when there's usage errors  
							
							... 
							
							
							
							Related to #821  
							
						 
						
							2015-07-10 21:56:12 -03:00  
				
					
						
							
							
								 
						
							
								25963e0544 
								
							 
						 
						
							
							
								
								adapt pytest to pluggy's decoratorclass branch  
							
							... 
							
							
							
							--HG--
branch : pluggy1 
							
						 
						
							2015-04-29 16:40:52 +02:00  
				
					
						
							
							
								 
						
							
								9aec5cd52d 
								
							 
						 
						
							
							
								
								use runpytest() instead of runpytest_inprocess if a test can run as subprocess as well  
							
							... 
							
							
							
							--HG--
branch : testrefactor 
							
						 
						
							2015-04-28 12:05:08 +02:00  
				
					
						
							
							
								 
						
							
								db5649ec6a 
								
							 
						 
						
							
							
								
								streamline pytester API majorly:  
							
							... 
							
							
							
							- integrate conftest into pytester plugin
- introduce runpytest() to either call runpytest_inline (default) or
  runpytest_subprocess (python -m pytest)
- move testdir.inline_runsource1 to pdb tests
- strike some unneccessary methods.
- a new section "writing plugins" and some better pytester docs
--HG--
branch : testrefactor 
							
						 
						
							2015-04-28 11:54:53 +02:00  
				
					
						
							
							
								 
						
							
								d3e363b97a 
								
							 
						 
						
							
							
								
								- make API between runpytest() and inline_run() more similar  
							
							... 
							
							
							
							- shift a number of tests to become inline_run() tests
--HG--
branch : testrefactor 
							
						 
						
							2015-04-28 11:54:45 +02:00  
				
					
						
							
							
								 
						
							
								424e5d1394 
								
							 
						 
						
							
							
								
								make test suite more tolerable against xdist causing warnings itself (which it does  
							
							... 
							
							
							
							currently)
--HG--
branch : plugtestfix 
							
						 
						
							2015-04-27 15:06:47 +02:00  
				
					
						
							
							
								 
						
							
								3a1374e69c 
								
							 
						 
						
							
							
								
								simplify plugins bookkeeping further, refine API  
							
							... 
							
							
							
							--HG--
branch : more_plugin 
							
						 
						
							2015-04-25 20:17:32 +02:00  
				
					
						
							
							
								 
						
							
								9c5495832c 
								
							 
						 
						
							
							
								
								avoid direct circular reference between config and pluginmanager  
							
							... 
							
							
							
							--HG--
branch : more_plugin 
							
						 
						
							2015-04-25 18:14:41 +02:00  
				
					
						
							
							
								 
						
							
								e7a2e53108 
								
							 
						 
						
							
							
								
								Streamline data structures  
							
							... 
							
							
							
							--HG--
branch : more_plugin 
							
						 
						
							2015-04-25 13:38:29 +02:00  
				
					
						
							
							
								 
						
							
								02a4042dca 
								
							 
						 
						
							
							
								
								incrementally update hook call lists instead of regenerating the whole  
							
							... 
							
							
							
							list on each registered plugin
--HG--
branch : more_plugin 
							
						 
						
							2015-04-25 11:29:11 +02:00  
				
					
						
							
							
								 
						
							
								d73e689991 
								
							 
						 
						
							
							
								
								fix issue616 - conftest visibility fixes.  This is achieved by  
							
							... 
							
							
							
							refactoring how nodeid's are constructed.  They now are always
relative to the "common rootdir" of a test run which is determined by
finding a common ancestor of all testrun arguments.
--HG--
branch : issue616 
							
						 
						
							2015-02-26 21:56:44 +01:00  
				
					
						
							
							
								 
						
							
								912c8f0540 
								
							 
						 
						
							
							
								
								Use monkeypatch to set the PYTEST_ADDOPTS environment variable in the test.  
							
							... 
							
							
							
							--HG--
branch : env-addopts 
							
						 
						
							2015-01-29 10:52:01 +00:00  
				
					
						
							
							
								 
						
							
								7325a5fe2e 
								
							 
						 
						
							
							
								
								Support setting configuration using the PYTEST_ADDOPTS environment variable.  
							
							... 
							
							
							
							--HG--
branch : env-addopts 
							
						 
						
							2015-01-23 20:09:42 +00:00  
				
					
						
							
							
								 
						
							
								c8264385ea 
								
							 
						 
						
							
							
								
								Implement the "-c" command line switch that allows to explicitly specifiy the config file to load.  
							
							... 
							
							
							
							This feature was requested in issue #174 .
--HG--
branch : explicit-ini-filename 
							
						 
						
							2014-06-27 17:42:37 +02:00  
				
					
						
							
							
								 
						
							
								54c88a6cf3 
								
							 
						 
						
							
							
								
								fix flakes issues  
							
							
							
						 
						
							2014-06-16 11:27:32 +02:00