61e605f60b 
								
							 
						 
						
							
							
								
								Making conftest import failures easier to debug  
							
							
							
						 
						
							2016-07-05 10:04:42 +01:00  
				
					
						
							
							
								 
						
							
								1b0dbd8c40 
								
							 
						 
						
							
							
								
								Move the freezing function from genscript.py to a new module freeze_support.py  
							
							
							
						 
						
							2016-06-26 19:37:24 +02:00  
				
					
						
							
							
								 
						
							
								0e2ebc96ff 
								
							 
						 
						
							
							
								
								Remove deprecated cmd options  
							
							... 
							
							
							
							Fixes  #1657  
						
							2016-06-26 19:26:04 +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  
				
					
						
							
							
								 
						
							
								13a188fe37 
								
							 
						 
						
							
							
								
								Merge pull request  #1647  from sallner/features  
							
							... 
							
							
							
							Add new options to report fixture setup and teardown 
							
						 
						
							2016-06-25 16:38:37 +02:00  
				
					
						
							
							
								 
						
							
								c519b9517a 
								
							 
						 
						
							
							
								
								Merge pull request  #1663  from aostr/master  
							
							... 
							
							
							
							Rename the default plugin "pdb" into "debugging" 
							
						 
						
							2016-06-25 09:56:54 -03:00  
				
					
						
							
							
								 
						
							
								df17f862fa 
								
							 
						 
						
							
							
								
								Merge pull request  #1648  from blueyed/simplify-Argument-__repr__  
							
							... 
							
							
							
							Simplify Argument.__repr__ 
							
						 
						
							2016-06-25 09:26:50 -03:00  
				
					
						
							
							
								 
						
							
								9a5224e2f8 
								
							 
						 
						
							
							
								
								Renamed the pdb module and changed unit tests accordingly  
							
							
							
						 
						
							2016-06-25 12:37:31 +02:00  
				
					
						
							
							
								 
						
							
								032ce8baf6 
								
							 
						 
						
							
							
								
								Switch setuponly and setupplan options to a hook-based implementation.  
							
							
							
						 
						
							2016-06-25 12:19:46 +02: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  
				
					
						
							
							
								 
						
							
								939407ef63 
								
							 
						 
						
							
							
								
								Simplify Argument.__repr__  
							
							... 
							
							
							
							I have came across this when noticing that universal-ctags fails to parse
this correctly (https://github.com/universal-ctags/ctags/issues/997 ). 
							
						 
						
							2016-06-25 09:31:31 +02:00  
				
					
						
							
							
								 
						
							
								69bab4ab04 
								
							 
						 
						
							
							
								
								added check for already existing option names to OptionGroup.addoption()  
							
							
							
						 
						
							2016-06-22 18:01:35 +02:00  
				
					
						
							
							
								 
						
							
								9fb5ddf778 
								
							 
						 
						
							
							
								
								Fix shell argument split in win32  
							
							... 
							
							
							
							This fixes the bug inserted by accident in #1523  
							
						 
						
							2016-05-23 20:41:47 -03:00  
				
					
						
							
							
								 
						
							
								1a37035d71 
								
							 
						 
						
							
							
								
								Add test test_absolute_win32_path  
							
							
							
						 
						
							2016-04-20 01:27:37 +08:00  
				
					
						
							
							
								 
						
							
								dd2425675b 
								
							 
						 
						
							
							
								
								Fix a small issue about shlex.split not working well with win32 path  
							
							
							
						 
						
							2016-04-19 13:08:08 +08:00  
				
					
						
							
							
								 
						
							
								3ea987ef9d 
								
							 
						 
						
							
							
								
								Copy over name and path attributes to the re-raised exception  
							
							
							
						 
						
							2016-03-10 18:13:59 -03:00  
				
					
						
							
							
								 
						
							
								7a186df271 
								
							 
						 
						
							
							
								
								Improve error message when a plugin fails to import  
							
							
							
						 
						
							2016-03-08 19:18:13 -03: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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								b3727438d6 
								
							 
						 
						
							
							
								
								Add missing nodeid on pytest_logwarning call in addhook.  
							
							... 
							
							
							
							Otherwise KeyError: 'nodeid' gets thrown, killing pytest. This may fix
issue 1034, but the details of it may be caused by something similar
somewhere else. 
							
						 
						
							2015-09-28 20:23:54 -04:00  
				
					
						
							
							
								 
						
							
								971ebcbd77 
								
							 
						 
						
							
							
								
								simplify by removing the single-call "exclude_pytest_names" function  
							
							
							
						 
						
							2015-09-28 15:43:55 +02:00  
				
					
						
							
							
								 
						
							
								4e3a807733 
								
							 
						 
						
							
							
								
								fix issue  #1073  -- shortcut plugin hook lookup if the attrname is not  
							
							... 
							
							
							
							prefixed with pytest_. 
							
						 
						
							2015-09-28 13:34:28 +02:00  
				
					
						
							
							
								 
						
							
								2575053697 
								
							 
						 
						
							
							
								
								Merge pull request  #1015  from hpk42/cache-integration  
							
							... 
							
							
							
							refined pytest-cache integration 
							
						 
						
							2015-09-16 21:46:46 +02:00  
				
					
						
							
							
								 
						
							
								e20216a1a8 
								
							 
						 
						
							
							
								
								merge the pytest-cache plugin into core  
							
							
							
						 
						
							2015-09-13 19:55:44 +02:00  
				
					
						
							
							
								 
						
							
								0b3f1b4a7c 
								
							 
						 
						
							
							
								
								Create `_pytest.vendored_packages` and _pytest._pluggy  
							
							... 
							
							
							
							- Replace imports from "pluggy" to "_pytest._pluggy"
- Fallback to import "pluggy" from global namespace if
  not found in _pytest.vendored_packges 
							
						 
						
							2015-09-07 13:01:54 -03:00  
				
					
						
							
							
								 
						
							
								8625eb643e 
								
							 
						 
						
							
							
								
								Merge pull request  #986  from RonnyPfannschmidt/early-logging  
							
							... 
							
							
							
							replay initial warnings when terminalreporter is loaded 
							
						 
						
							2015-09-02 19:10:53 -03:00  
				
					
						
							
							
								 
						
							
								76f0988551 
								
							 
						 
						
							
							
								
								turn the pytest_logwarning hook historic  
							
							
							
						 
						
							2015-09-02 18:49:49 +02:00  
				
					
						
							
							
								 
						
							
								3fa261564b 
								
							 
						 
						
							
							
								
								replay initial warnings when terminalreporter is loaded  
							
							
							
						 
						
							2015-08-31 21:54:12 +02:00  
				
					
						
							
							
								 
						
							
								4533a50542 
								
							 
						 
						
							
							
								
								Fix regression caused by changing the signature for parse_known_args  
							
							... 
							
							
							
							Fix  #973  
						
							2015-08-27 19:35:32 -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  
				
					
						
							
							
								 
						
							
								e103932aad 
								
							 
						 
						
							
							
								
								Reintroduce hasplugin to PytestPluginManager  
							
							... 
							
							
							
							Fix  #932  
						
							2015-08-09 19:30:49 -03:00  
				
					
						
							
							
								 
						
							
								023687d8d0 
								
							 
						 
						
							
							
								
								Merge pull request  #872  from nicoddemus/confcutdir-inifile  
							
							... 
							
							
							
							Avoid detecting conftest files upwards from setup.cfg/pytest.ini/tox.ini by default 
							
						 
						
							2015-07-25 14:03:24 +02:00  
				
					
						
							
							
								 
						
							
								9f94e443ff 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/pytest-2.7'  
							
							... 
							
							
							
							Conflicts:
	testing/conftest.py 
							
						 
						
							2015-07-24 19:24:21 -03:00  
				
					
						
							
							
								 
						
							
								35bbcc39a2 
								
							 
						 
						
							
							
								
								Interpret strings to "plugins" arg in pytest.main() as module names  
							
							... 
							
							
							
							See #855  
							
						 
						
							2015-07-23 23:37:09 -03:00  
				
					
						
							
							
								 
						
							
								ab9e246ab0 
								
							 
						 
						
							
							
								
								Avoid detecting conftest files upwards from setup.cfg/pytest.ini/tox.ini files by default  
							
							... 
							
							
							
							As discussed in #82  
							
						 
						
							2015-07-23 23:21:07 -03:00  
				
					
						
							
							
								 
						
							
								df29120abe 
								
							 
						 
						
							
							
								
								Merge branch 'pytest-2.7'  
							
							... 
							
							
							
							Conflicts:
	_pytest/config.py
	_pytest/genscript.py
	_pytest/mark.py
	tox.ini 
							
						 
						
							2015-07-23 22:35:51 -03:00  
				
					
						
							
							
								 
						
							
								2f7d0f8bd9 
								
							 
						 
						
							
							
								
								Consider --color option in more places which deal with TerminalWriters  
							
							
							
						 
						
							2015-07-18 16:39:55 -03:00  
				
					
						
							
							
								 
						
							
								1baa1a4d01 
								
							 
						 
						
							
							
								
								Merge pull request  #822  from nicoddemus/extra-usage-info  
							
							... 
							
							
							
							Print inifile and rootdir when there's usage errors 
							
						 
						
							2015-07-11 13:43:20 -03:00  
				
					
						
							
							
								 
						
							
								8a6aa5e17e 
								
							 
						 
						
							
							
								
								Print inifile and rootdir when there's usage errors  
							
							... 
							
							
							
							Related to #821  
							
						 
						
							2015-07-10 21:56:12 -03:00  
				
					
						
							
							
								 
						
							
								854e603f84 
								
							 
						 
						
							
							
								
								Add new testdirs ini option  
							
							... 
							
							
							
							Fix  #694  
						
							2015-07-10 21:52:47 -03:00  
				
					
						
							
							
								 
						
							
								3c2fd833ca 
								
							 
						 
						
							
							
								
								Reintroduce get_plugin_manager() for backward-compatibility  
							
							... 
							
							
							
							PyCharm pytest runner depends on this function existing (see #787 ).
Added reference to get_plugin_manager() and PluginManager/PytestPluginManager to docs 
							
						 
						
							2015-06-25 00:48:47 -03:00  
				
					
						
							
							
								 
						
							
								f78b6df8bc 
								
							 
						 
						
							
							
								
								Return an empty list directly.  
							
							
							
						 
						
							2015-06-23 14:05:44 +02:00  
				
					
						
							
							
								 
						
							
								8664fc4102 
								
							 
						 
						
							
							
								
								Add a --noconftest option.  
							
							
							
						 
						
							2015-06-23 09:38:54 +02:00  
				
					
						
							
							
								 
						
							
								bddc88f09e 
								
							 
						 
						
							
							
								
								adapt to pluggy naming, rename pytest.hookspec_opts to pytest.hookspec,s ame with hookimpl_opts  
							
							... 
							
							
							
							--HG--
branch : pluggy1 
							
						 
						
							2015-05-06 10:08:08 +02:00  
				
					
						
							
							
								 
						
							
								23538bcd31 
								
							 
						 
						
							
							
								
								- some more adaptation to most recent pluggy API  
							
							... 
							
							
							
							- avoid using pluggin underscore api
- show pluggy version in header
--HG--
branch : pluggy1 
							
						 
						
							2015-05-05 21:53:04 +02:00  
				
					
						
							
							
								 
						
							
								88538f13ba 
								
							 
						 
						
							
							
								
								adapt for current API changes of pluggy  
							
							... 
							
							
							
							--HG--
branch : pluggy1 
							
						 
						
							2015-05-04 15:08:41 +02:00  
				
					
						
							
							
								 
						
							
								25963e0544 
								
							 
						 
						
							
							
								
								adapt pytest to pluggy's decoratorclass branch  
							
							... 
							
							
							
							--HG--
branch : pluggy1 
							
						 
						
							2015-04-29 16:40:52 +02:00  
				
					
						
							
							
								 
						
							
								5ee7ee0850 
								
							 
						 
						
							
							
								
								adapt pytest to using pluggy (current master)  
							
							... 
							
							
							
							--HG--
branch : pluggy1 
							
						 
						
							2015-04-29 16:40:51 +02:00  
				
					
						
							
							
								 
						
							
								a8afba054a 
								
							 
						 
						
							
							
								
								- refine lsof checking  
							
							... 
							
							
							
							- make runpytest() create an inline testing process instead of
  a subprocess one
--HG--
branch : testrefactor 
							
						 
						
							2015-04-28 11:54:46 +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  
				
					
						
							
							
								 
						
							
								b2d66b9e7b 
								
							 
						 
						
							
							
								
								simplify load_setuptools_entrypoints and refine comments/docstrings  
							
							... 
							
							
							
							--HG--
branch : more_plugin 
							
						 
						
							2015-04-27 14:10:33 +02:00  
				
					
						
							
							
								 
						
							
								c54afbe42e 
								
							 
						 
						
							
							
								
								deprecate and warn about __multicall__ usage in hooks, refine docs about hook ordering,  
							
							... 
							
							
							
							make hookwrappers respect tryfirst/trylast
--HG--
branch : more_plugin 
							
						 
						
							2015-04-27 12:50:34 +02:00  
				
					
						
							
							
								 
						
							
								d2ea7387f2 
								
							 
						 
						
							
							
								
								re-add tryfirst/trylast marker documentation, mark it as to be removed  
							
							... 
							
							
							
							--HG--
branch : more_plugin 
							
						 
						
							2015-04-26 00:47:24 +02:00  
				
					
						
							
							
								 
						
							
								8e009ee31c 
								
							 
						 
						
							
							
								
								move consider_setuptools_entrypoints to core pluginmanager  
							
							... 
							
							
							
							--HG--
branch : more_plugin 
							
						 
						
							2015-04-26 00:41:29 +02:00  
				
					
						
							
							
								 
						
							
								0c961deeaa 
								
							 
						 
						
							
							
								
								fix some doc strings  
							
							... 
							
							
							
							--HG--
branch : more_plugin 
							
						 
						
							2015-04-26 00:22:34 +02:00  
				
					
						
							
							
								 
						
							
								32165d82b1 
								
							 
						 
						
							
							
								
								introduce a new subset_hook_caller instead of remove make_hook_caller  
							
							... 
							
							
							
							and adapat and refine conftest/global plugin management accordingly
--HG--
branch : more_plugin 
							
						 
						
							2015-04-26 00:10:52 +02:00  
				
					
						
							
							
								 
						
							
								d422247433 
								
							 
						 
						
							
							
								
								specialize make_hook_caller to work with a subset of the registered plugins.  
							
							... 
							
							
							
							--HG--
branch : more_plugin 
							
						 
						
							2015-04-25 22:13:42 +02:00  
				
					
						
							
							
								 
						
							
								3a1374e69c 
								
							 
						 
						
							
							
								
								simplify plugins bookkeeping further, refine API  
							
							... 
							
							
							
							--HG--
branch : more_plugin 
							
						 
						
							2015-04-25 20:17:32 +02:00  
				
					
						
							
							
								 
						
							
								1e883f5979 
								
							 
						 
						
							
							
								
								simplify tracing mechanics by simply going through an indirection  
							
							... 
							
							
							
							--HG--
branch : more_plugin 
							
						 
						
							2015-04-25 18:15:39 +02:00  
				
					
						
							
							
								 
						
							
								9c5495832c 
								
							 
						 
						
							
							
								
								avoid direct circular reference between config and pluginmanager  
							
							... 
							
							
							
							--HG--
branch : more_plugin 
							
						 
						
							2015-04-25 18:14:41 +02:00  
				
					
						
							
							
								 
						
							
								4e116ed503 
								
							 
						 
						
							
							
								
								make pytest_plugin_registered a historic hook  
							
							... 
							
							
							
							--HG--
branch : more_plugin 
							
						 
						
							2015-04-25 13:38:30 +02:00  
				
					
						
							
							
								 
						
							
								a63585dcab 
								
							 
						 
						
							
							
								
								introduce historic hook spec which will memorize calls to a hook  
							
							... 
							
							
							
							in order to call them on later registered plugins
--HG--
branch : more_plugin 
							
						 
						
							2015-04-25 11:29:11 +02:00  
				
					
						
							
							
								 
						
							
								bbbb6dc2e3 
								
							 
						 
						
							
							
								
								remove _do_register indirection between PluginManager and PytestPluginManager  
							
							... 
							
							
							
							--HG--
branch : more_plugin 
							
						 
						
							2015-04-25 11:29:11 +02:00  
				
					
						
							
							
								 
						
							
								b03c1342ac 
								
							 
						 
						
							
							
								
								allow to register plugins with hooks that are only added later  
							
							... 
							
							
							
							--HG--
branch : more_plugin 
							
						 
						
							2015-04-25 11:29:11 +02:00  
				
					
						
							
							
								 
						
							
								feb4b2249a 
								
							 
						 
						
							
							
								
								remove some redundancy when parsing import spec  
							
							... 
							
							
							
							--HG--
branch : plugin_no_pytest 
							
						 
						
							2015-04-23 13:15:34 +02:00  
				
					
						
							
							
								 
						
							
								95dd2eb1da 
								
							 
						 
						
							
							
								
								streamline and document handling of builtin module special casing.  
							
							... 
							
							
							
							--HG--
branch : plugin_no_pytest 
							
						 
						
							2015-04-23 12:39:11 +02:00  
				
					
						
							
							
								 
						
							
								715a235b45 
								
							 
						 
						
							
							
								
								remove shutdown logic from PluginManager and add a add_cleanup() API  
							
							... 
							
							
							
							for the already existing cleanup logic of the config object.
This simplifies lifecycle management as we don't keep two
layers of shutdown functions and also simplifies the pluginmanager
interface.
also add some docstrings.
--HG--
branch : plugin_no_pytest 
							
						 
						
							2015-04-22 16:33:20 +02:00  
				
					
						
							
							
								 
						
							
								f746c190ac 
								
							 
						 
						
							
							
								
								slight cleanup of plugin register() functionality  
							
							... 
							
							
							
							--HG--
branch : plugin_no_pytest 
							
						 
						
							2015-04-22 14:54:28 +02:00  
				
					
						
							
							
								 
						
							
								d632a0d5c2 
								
							 
						 
						
							
							
								
								merge conftest management into PytestPluginManager  
							
							... 
							
							
							
							--HG--
branch : plugin_no_pytest 
							
						 
						
							2015-04-22 14:15:42 +02:00  
				
					
						
							
							
								 
						
							
								894d7dca22 
								
							 
						 
						
							
							
								
								avoid undocumented special casing of "pytest_" prefix  
							
							... 
							
							
							
							--HG--
branch : plugin_no_pytest 
							
						 
						
							2015-04-22 13:44:37 +02:00  
				
					
						
							
							
								 
						
							
								20d6c0b560 
								
							 
						 
						
							
							
								
								simplify exception capturing  
							
							... 
							
							
							
							--HG--
branch : plugin_no_pytest 
							
						 
						
							2015-04-22 13:37:42 +02:00  
				
					
						
							
							
								 
						
							
								c08dfdc330 
								
							 
						 
						
							
							
								
								move bookkeeping of conftest plugins in core pluginmanager to PytestPluginManager  
							
							... 
							
							
							
							--HG--
branch : plugin_no_pytest 
							
						 
						
							2015-04-22 13:33:01 +02:00  
				
					
						
							
							
								 
						
							
								1ef49ac5ab 
								
							 
						 
						
							
							
								
								minimize HookRelay to become a pure container, refactor initialization and  
							
							... 
							
							
							
							tests of plugin management to be a bit better split between pytest
and pytest-independent bits
--HG--
branch : plugin_no_pytest 
							
						 
						
							2015-04-22 13:31:46 +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  
				
					
						
							
							
								 
						
							
								8f12269db7 
								
							 
						 
						
							
							
								
								Use shlex to split the arguments from PYTEST_ADDOPTS.  
							
							... 
							
							
							
							--HG--
branch : env-addopts 
							
						 
						
							2015-01-26 10:39:21 +00:00  
				
					
						
							
							
								 
						
							
								7325a5fe2e 
								
							 
						 
						
							
							
								
								Support setting configuration using the PYTEST_ADDOPTS environment variable.  
							
							... 
							
							
							
							--HG--
branch : env-addopts 
							
						 
						
							2015-01-23 20:09:42 +00:00  
				
					
						
							
							
								 
						
							
								2161b54555 
								
							 
						 
						
							
							
								
								remove overhead for tracing of hook calls and remove some old unused code  
							
							
							
						 
						
							2014-10-02 15:25:42 +02:00  
				
					
						
							
							
								 
						
							
								3de715ec13 
								
							 
						 
						
							
							
								
								refine internal management of plugins and conftest files  
							
							
							
						 
						
							2014-10-01 12:19:11 +02:00  
				
					
						
							
							
								 
						
							
								3e875178ad 
								
							 
						 
						
							
							
								
								Merge default  
							
							
							
						 
						
							2014-08-01 23:06:24 +01:00  
				
					
						
							
							
								 
						
							
								4e8438afc8 
								
							 
						 
						
							
							
								
								Simply show the node ID for verbose output  
							
							... 
							
							
							
							This strips the line number, /@\d/, from the verbose output so it is
directly the node ID of the test.  This in turn means no special logic
for accepting the line number as part of the node ID is needed when
parsing the command line. 
							
						 
						
							2014-08-01 00:29:35 +01:00  
				
					
						
							
							
								 
						
							
								5603a0cd4b 
								
							 
						 
						
							
							
								
								Removing py.std usage from _pytest  
							
							
							
						 
						
							2014-07-31 19:13:40 -03:00  
				
					
						
							
							
								 
						
							
								83e0b52294 
								
							 
						 
						
							
							
								
								speedup @ replacement for the massive lists from pytest-bdd :)  
							
							... 
							
							
							
							--HG--
branch : fix_initial_parsing 
							
						 
						
							2014-07-28 13:53:53 +02:00  
				
					
						
							
							
								 
						
							
								40eed363e8 
								
							 
						 
						
							
							
								
								fix issue544 by only removing "@NUM" at the end of a part (parts are  
							
							... 
							
							
							
							separated by "::") and if the part has an .py extension.
--HG--
branch : fix_initial_parsing 
							
						 
						
							2014-07-28 12:07:15 +02:00  
				
					
						
							
							
								 
						
							
								5ccd3f2fc5 
								
							 
						 
						
							
							
								
								fix conftest detection if commandline arguments contain "::" syntax  
							
							... 
							
							
							
							--HG--
branch : fix_initial_parsing 
							
						 
						
							2014-07-28 11:48:37 +02:00  
				
					
						
							
							
								 
						
							
								a811fabb43 
								
							 
						 
						
							
							
								
								avoid importing "py.test" (an old alias module for "pytest")  
							
							
							
						 
						
							2014-07-03 12:58:12 +02:00  
				
					
						
							
							
								 
						
							
								b7f6a9f3fd 
								
							 
						 
						
							
							
								
								Cleaner implementation of early handling of the '-c' command line switch.  
							
							... 
							
							
							
							--HG--
branch : explicit-ini-filename 
							
						 
						
							2014-06-28 12:03:55 +02: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  
				
					
						
							
							
								 
						
							
								d6281b4206 
								
							 
						 
						
							
							
								
								- restore compatibility to old getvalueorskip behaviour  
							
							... 
							
							
							
							- introduce a better NOTSET representation to improve docs 
							
						 
						
							2014-05-14 07:36:31 +02:00  
				
					
						
							
							
								 
						
							
								2ba23e8d08 
								
							 
						 
						
							
							
								
								issue504: verbose output displays node IDs for each test  
							
							... 
							
							
							
							Replace the verbose per-test reporting format of `file:line test_name RESULT`
with the node ID of the test, i.e. `file@line::class::method[param] RESULT`.
This patch does not update the examples in the docs; @hpk42 has a script
to regenerate those.
--HG--
branch : issue504 
							
						 
						
							2014-04-14 17:42:02 -04:00  
				
					
						
							
							
								 
						
							
								b4fe91943d 
								
							 
						 
						
							
							
								
								Merged in hpk42/pytest-hpk/conftest-clean (pull request  #148 )  
							
							... 
							
							
							
							cleanup internal conftest handling and avoid the strange None entry in the conftest cache. 
							
						 
						
							2014-04-03 09:38:47 +02:00  
				
					
						
							
							
								 
						
							
								0365e5c3a0 
								
							 
						 
						
							
							
								
								cleanup internal conftest handling and avoid the strange None entry in the conftest cache.  
							
							... 
							
							
							
							(There is basically no reason to ask for conftestmodules without specifying a path.)
--HG--
branch : conftest-clean 
							
						 
						
							2014-04-02 22:30:45 +02:00  
				
					
						
							
							
								 
						
							
								51cff6f106 
								
							 
						 
						
							
							
								
								fix issue486: better reporting and handling of early conftest loading failures  
							
							... 
							
							
							
							--HG--
branch : issue486 
							
						 
						
							2014-04-02 20:42:41 +02:00  
				
					
						
							
							
								 
						
							
								3bca62e9e4 
								
							 
						 
						
							
							
								
								fix issue436: improved finding of initial conftest files from command  
							
							... 
							
							
							
							line arguments by using the result of parse_known_args rather than
the previous flaky heuristics.  Thanks Marc Abramowitz for tests
and initial fixing approaches in this area. 
							
						 
						
							2014-04-02 11:29:23 +02:00  
				
					
						
							
							
								 
						
							
								7b63fa5966 
								
							 
						 
						
							
							
								
								merge in current default  
							
							
							
						 
						
							2014-03-27 13:57:54 +01:00  
				
					
						
							
							
								 
						
							
								8af265da04 
								
							 
						 
						
							
							
								
								_pytest/config.py: In --help, show args with `=` instead of space.  
							
							... 
							
							
							
							The `=` is better because it encourages folks to use the form that doesn't
suffer from issue #436  (https://bitbucket.org/hpk42/pytest/issue/436 ), which
can cause the arg to be treated as an "anchor" and used as the (unexpected)
path for searching for conftest.py files.
--HG--
branch : help_show_args_with_equals_instead_of_space 
							
						 
						
							2014-03-26 10:47:30 -07:00  
				
					
						
							
							
								 
						
							
								9777703e03 
								
							 
						 
						
							
							
								
								- turn on capturing before early conftest loading and make terminal writer  
							
							... 
							
							
							
							use the original stream.
- avoid resetting capture FDs/sys.stdout for each test by keeping capturing
  always turned on and looking at snapshotted capturing data during runtest
  and collection phases. 
							
						 
						
							2014-03-14 12:49:36 +01:00  
				
					
						
							
							
								 
						
							
								ebd10aa6b4 
								
							 
						 
						
							
							
								
								shrink and merge the somewhat obscure and undocumented internal hinting  
							
							... 
							
							
							
							system with the new warnings one 
							
						 
						
							2014-03-11 22:10:51 +01:00  
				
					
						
							
							
								 
						
							
								1b387bea62 
								
							 
						 
						
							
							
								
								introduce warning system with this API:  
							
							... 
							
							
							
							- node.warn() for a node-specific warning
- config.warn() for a global non-node specific warning
Each warning is accompanied by a "warning number" so that we can later
introduce mechanisms for surpressing them.
Each warning will trigger a call to pytest_report_warn(number, node, message)
which is by default implemented by the TerminalReporter which introduces
a new option "-rw" to show details about warnings. 
							
						 
						
							2014-03-11 22:10:17 +01:00  
				
					
						
							
							
								 
						
							
								3a4f69734a 
								
							 
						 
						
							
							
								
								remove superflous line  
							
							
							
						 
						
							2014-01-22 13:54:25 +01:00  
				
					
						
							
							
								 
						
							
								1ffc006363 
								
							 
						 
						
							
							
								
								fixed circular imports by reverting a few py.test -> pytest substitions.  
							
							
							
						 
						
							2014-01-22 11:17:25 +01:00  
				
					
						
							
							
								 
						
							
								9fb2079458 
								
							 
						 
						
							
							
								
								replace py.test module references with pytest  
							
							... 
							
							
							
							The only remaining 'py.test' references are:
 * those referring to the 'py.test' executable
 * those in code explicitly testing py.test/pytest module compatibility
 * those in old CHANGES documentation
 * those in documentation generated based on external data
 * those in seemingly unfinished & unmaintained Japanese documentation
Minor stylistic changes and typo corrections made to documentation next to
several applied py.test --> pytest content changes. 
							
						 
						
							2014-01-18 12:31:33 +01:00  
				
					
						
							
							
								 
						
							
								5a13f31bce 
								
							 
						 
						
							
							
								
								fix issue407: fix addoption docstring to point to argparse instead of  
							
							... 
							
							
							
							optparse. Thanks Daniel D. Wright. 
							
						 
						
							2013-12-16 18:07:05 +01:00  
				
					
						
							
							
								 
						
							
								5c3d692008 
								
							 
						 
						
							
							
								
								some minor internal cleanup  
							
							
							
						 
						
							2013-12-09 10:40:39 +01:00  
				
					
						
							
							
								 
						
							
								8ac5af2896 
								
							 
						 
						
							
							
								
								fix flakes issues and make --flakes run part of tox runs  
							
							
							
						 
						
							2013-10-12 15:39:22 +02:00  
				
					
						
							
							
								 
						
							
								1db6fc87c7 
								
							 
						 
						
							
							
								
								Allow unicode strings in parser.add_argument()  
							
							... 
							
							
							
							This fixes issue360 by also converting unicode strings to the argparse
syntax instead of just native strings. 
							
						 
						
							2013-10-01 13:20:20 +01:00  
				
					
						
							
							
								 
						
							
								db6f347db6 
								
							 
						 
						
							
							
								
								fix issue358 -- introduce new pytest_load_initial_conftests hook and make capturing initialization use it, relying on a new (somewhat internal) parser.parse_known_args() method.  
							
							... 
							
							
							
							This also addresses issue359 -- plugins like pytest-django could implement a pytest_load_initial_conftests hook like the capture plugin. 
							
						 
						
							2013-09-30 13:14:16 +02:00  
				
					
						
							
							
								 
						
							
								4b709037ab 
								
							 
						 
						
							
							
								
								some more separation of core pluginmanager from pytest specific functionality.  
							
							... 
							
							
							
							Idea is to have the PluginManager be re-useable from other projects at some point. 
							
						 
						
							2013-09-30 13:14:14 +02:00  
				
					
						
							
							
								 
						
							
								d946299b0a 
								
							 
						 
						
							
							
								
								shift pytest_configure/unconfigure/addoption/namespace hook calling to config object.  
							
							... 
							
							
							
							The _pytest.config module itself is no longer a plugin but the actual
config instance is plugin-registered as ``pytestconfig``.
This allows to put most pytest specific logic to _pytest.config instead
of in the core pluginmanager. 
							
						 
						
							2013-09-30 13:14:14 +02:00  
				
					
						
							
							
								 
						
							
								694c6fd0e7 
								
							 
						 
						
							
							
								
								localize some argcomplete-related functionality  
							
							
							
						 
						
							2013-09-30 10:19:06 +02:00  
				
					
						
							
							
								 
						
							
								03c314e3be 
								
							 
						 
						
							
							
								
								refine fromdictargs to avoid an uncessary re-setup of the pluginmanager  
							
							
							
						 
						
							2013-09-28 22:22:55 +02:00  
				
					
						
							
							
								 
						
							
								fad7bd4393 
								
							 
						 
						
							
							
								
								simplify Config constructor  
							
							
							
						 
						
							2013-09-28 22:22:53 +02:00  
				
					
						
							
							
								 
						
							
								b80e875525 
								
							 
						 
						
							
							
								
								move FILE_OR_DIR constant out  
							
							
							
						 
						
							2013-09-28 09:52:41 +02:00  
				
					
						
							
							
								 
						
							
								007a77c2ba 
								
							 
						 
						
							
							
								
								drop help for long options if longer versions with hyphens are available  
							
							... 
							
							
							
							--HG--
branch : opt-drop-non-hyphened-long-options 
							
						 
						
							2013-08-01 16:21:33 +02:00  
				
					
						
							
							
								 
						
							
								b90d82c17f 
								
							 
						 
						
							
							
								
								fix some py33 issues introduced with rev 2985  
							
							... 
							
							
							
							--HG--
branch : argcomplete 
							
						 
						
							2013-08-01 14:24:25 +02:00  
				
					
						
							
							
								 
						
							
								87860600fb 
								
							 
						 
						
							
							
								
								Fixes for argcomplete  
							
							... 
							
							
							
							- separate out most argcomplete related stuff in new file _argcomplete.py
  (could probably be in the py library)
- allow positional arguments to be interspaced with optional arguments
  ( + test in test_parseopt.py )
- removed double argument in tox.ini
- add documentation on installing argcomplete (>=0.5.7 as needed for
  Python 3), might need improving/incorporation in index.
This does not work on 2.5 yet. I have patches for argcomplete
(with/print()/"".format) but I am not sure they will be accepted.
Agreed with hpk not to push for that.
Removing argcomplete and leaving completion code active now works by early
exit, so <TAB> no longer re-runs the programs without parameters
(which took long for py.test)
test calls bash with a script that redirects filedescriptor 8 (as used by
argcomplete), so the result can be tested.
--HG--
branch : argcomplete 
							
						 
						
							2013-07-30 11:26:15 +02:00  
				
					
						
							
							
								 
						
							
								ad72e7f29d 
								
							 
						 
						
							
							
								
								auto change %default -> %(default)s in help parameter string (on retrieval)  
							
							... 
							
							
							
							added code for warnings on optparse arguments (type, help),
which can be easily switched on with TYPE_WARN = True in config.py
installed and tested ( py.test --help )
pytest-quickcheck-0.7
pytest-gae-0.2.2
pytest-growl-0.1
pytest-bdd-0.4.7
pytest-bdd-splinter-0.4.4
pytest-cache-1.0
pytest-capturelog-0.7
pytest-codecheckers-0.2
pytest-contextfixture-0.1.1
pytest-cov-1.6
pytest-flakes-0.1
pytest-incremental-0.3.0
pytest-xdist-1.8
pytest-localserver-0.1.5
pytest-monkeyplus-1.1.0
pytest-oerp-0.2.0
pytest-pep8-1.0.4
pytest-pydev-0.1
pytest-rage-0.1
pytest-runfailed-0.3
pytest-timeout-0.3
pytest-xprocess-0.7
pytest-browsermob-proxy-0.1
pytest-mozwebqa-1.1.1
pytest-random-0.02
pytest-rerunfailures-0.03
pytest-zap-0.1
pytest-blockage-0.1
pytest-django-2.3.0
pytest-figleaf-1.0
pytest-greendots-0.1
pytest-instafail-0.1.0
pytest-konira-0.2
pytest-marker-bugzilla-0.06
pytest-marks-0.4
pytest-poo-0.2
pytest-twisted-1.4
pytest-yamlwsgi-0.6
--HG--
branch : argparse 
							
						 
						
							2013-07-25 17:26:48 +02:00  
				
					
						
							
							
								 
						
							
								15ec5a898c 
								
							 
						 
						
							
							
								
								moving from optparse to argparse. Major difficulty is  
							
							... 
							
							
							
							that argparse does not have Option objects -> added class Argument
Needed explicit call of MyOptionParser.format_epilog as argparse
does not have that. The parse_arg epilog argument wraps the text,
which is not the same (could be handled with a special formatter).
- parser.parse() now returns single argument (with positional args in
  .file_or_dir)
- "file_or_dir" made a class variable Config._file_or_dir and used in help and tests
- added code for argcomplete (because of which this all started!)
addoption:
- if option type is a string ('int' or 'string', this converted to
  int resp. str
- if option type is 'count' this is changed to the type of choices[0]
testing:
- added tests for Argument
- test_mark.test_keyword_extra split as ['-k', '-mykeyword'] generates argparse
  error test split in two and one marked as fail
- testing hints, multiline and more strickt (for if someone moves format_epilog
  to epilog argument of parse_args without Formatter)
- test for destination derived from long option with internal dash
- renamed second test_parseopt.test_parse() to test_parse2 as it was
  not tested at all (the first was tested.)
--HG--
branch : argparse 
							
						 
						
							2013-07-25 15:33:43 +02:00  
				
					
						
							
							
								 
						
							
								c93fbb0e57 
								
							 
						 
						
							
							
								
								Load conftest files in the correct order initially  
							
							... 
							
							
							
							When the conftest.py files are looked for intially they got loaded
starting from the subdir ending at the parent dir(s).  Later on during
collection any conftest.py files are loaded starting from the parent
dir ending at the subdir.  Due to how extending fixtures works the
latter is correct as otherwise the wrong fixture will be available.
So this changes the initial conftest loading to start at the root and
go towards the subdir.
This does also affect the order of other hooks, hence the order of the
reporting being different in testing/test_terminal.py. 
							
						 
						
							2013-04-18 12:24:53 +01:00  
				
					
						
							
							
								 
						
							
								c64c567b75 
								
							 
						 
						
							
							
								
								fix issue224 - invocations with >256 char arguments now work  
							
							
							
						 
						
							2012-11-12 10:15:43 +01:00  
				
					
						
							
							
								 
						
							
								33cd414420 
								
							 
						 
						
							
							
								
								fix issue127 improve pytest_addoption docs, add new config.getoption(name) method for consistency.  
							
							
							
						 
						
							2012-11-06 14:09:12 +01:00  
				
					
						
							
							
								 
						
							
								6b6080ae6c 
								
							 
						 
						
							
							
								
								remove unused code  
							
							
							
						 
						
							2012-10-28 10:12:36 +01:00  
				
					
						
							
							
								 
						
							
								b8277bfed8 
								
							 
						 
						
							
							
								
								fix issue127 - improve pytest_addoption and related documentation  
							
							
							
						 
						
							2012-10-25 11:07:07 +02:00  
				
					
						
							
							
								 
						
							
								ecec653e98 
								
							 
						 
						
							
							
								
								fix issue151 - heuristcally lookup conftest files on all command line arguments, not just the first existing dir/file  
							
							... 
							
							
							
							you can install the corresponding pytest-2.3.dev2 via
pip install -i http:/pypi.testrun.org -U pytest 
							
						 
						
							2012-06-26 21:56:03 +02:00  
				
					
						
							
							
								 
						
							
								0ba0f91720 
								
							 
						 
						
							
							
								
								remove unused code  
							
							
							
						 
						
							2012-06-26 20:28:09 +02:00  
				
					
						
							
							
								 
						
							
								979dfd20f2 
								
							 
						 
						
							
							
								
								add a method to the config object to dynamically add a value to an (line-type) ini-value  
							
							
							
						 
						
							2011-11-11 22:56:08 +00:00  
				
					
						
							
							
								 
						
							
								a2f4a11301 
								
							 
						 
						
							
							
								
								refine lsof/FD leakage testing and rework test setup and some of pytest own tests.   Note that the actual diff to non-test code is small.  Also remove some redundant tests (introduced by a copy-paste-error apparently in test_mark.py).  
							
							
							
						 
						
							2011-11-07 18:08:41 +00:00  
				
					
						
							
							
								 
						
							
								f2512017ea 
								
							 
						 
						
							
							
								
								correctly handle zero length cmdline arguments  
							
							
							
						 
						
							2011-09-25 23:26:49 +02:00  
				
					
						
							
							
								 
						
							
								650c3bcfde 
								
							 
						 
						
							
							
								
								enhance debug tracing: print trace tags at the end of message and forget about "prefix".  
							
							... 
							
							
							
							Always log to "pytestdebug.log" if "--debug" option is given.
also move related code to pytest_helpconfig plugin. 
							
						 
						
							2011-07-14 19:11:50 +02:00  
				
					
						
							
							
								 
						
							
								942ae47cd1 
								
							 
						 
						
							
							
								
								tentatively use internal list for cleanups at unconfigure time - this helps reporting with partially executed pytest_configure() hooks  
							
							
							
						 
						
							2011-04-17 12:20:13 +02:00  
				
					
						
							
							
								 
						
							
								1d40abadc4 
								
							 
						 
						
							
							
								
								offer a semi-internal method to create a config object in subprocesses  
							
							... 
							
							
							
							(helps pytest-xdist plugin to fix issue34) 
							
						 
						
							2011-03-16 18:00:52 +01:00  
				
					
						
							
							
								 
						
							
								d8d88ede65 
								
							 
						 
						
							
							
								
								refine and unify initial capturing - now works also if the logging module  
							
							... 
							
							
							
							is already used from an early-loaded conftest.py file (prior to option parsing) 
							
						 
						
							2011-01-18 12:51:21 +01:00  
				
					
						
							
							
								 
						
							
								170c78cef9 
								
							 
						 
						
							
							
								
								remove same-conftest.py detection - does more harm than good  
							
							... 
							
							
							
							(see mail from Ralf Schmitt on py-dev) 
							
						 
						
							2011-01-11 15:54:47 +01:00  
				
					
						
							
							
								 
						
							
								a15983cb33 
								
							 
						 
						
							
							
								
								rather named the new hook cmdline_preparse  
							
							
							
						 
						
							2010-12-07 12:34:18 +01:00  
				
					
						
							
							
								 
						
							
								9ab256c296 
								
							 
						 
						
							
							
								
								make getvalueorskip() be hidden in skip-reporting. also bump version.  
							
							
							
						 
						
							2010-12-07 12:18:24 +01:00  
				
					
						
							
							
								 
						
							
								7db9e98b55 
								
							 
						 
						
							
							
								
								introduce a pytest_cmdline_processargs hook to modify/add dynamically to command line arguments.  
							
							
							
						 
						
							2010-12-07 12:14:12 +01:00  
				
					
						
							
							
								 
						
							
								c7531705fc 
								
							 
						 
						
							
							
								
								refine plugin registration, allow new "-p no:NAME" way to prevent/undo plugin registration  
							
							
							
						 
						
							2010-12-06 16:54:42 +01:00  
				
					
						
							
							
								 
						
							
								4cb2c74159 
								
							 
						 
						
							
							
								
								introduce new discovery mechanism  
							
							... 
							
							
							
							XXX experiment with using it before introducing it or wait
for feature request 
							
						 
						
							2010-11-24 22:01:04 +01:00  
				
					
						
							
							
								 
						
							
								0357d3afda 
								
							 
						 
						
							
							
								
								refine initialization and collection reporting, introduce a progress bar  
							
							
							
						 
						
							2010-11-22 11:59:56 +01:00  
				
					
						
							
							
								 
						
							
								f456e376b9 
								
							 
						 
						
							
							
								
								refine tmpdir handling and docs  
							
							... 
							
							
							
							- clear tmpdir specified with --basetemp
- remove config.mktmp and config.getbasetemp methods 
							
						 
						
							2010-11-21 17:43:18 +01:00  
				
					
						
							
							
								 
						
							
								929291775e 
								
							 
						 
						
							
							
								
								flat is better than nested (cont'd):  
							
							... 
							
							
							
							- pytest.py is new module, making "python -m pytest" work always
- _pytest/*.py now contains core.py, hookspec and the plugins, no sub packages 
							
						 
						
							2010-11-13 11:10:45 +01:00