1e0cf5ce4d 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into merge-master-into-features  
							
							... 
							
							
							
							# Conflicts:
#	AUTHORS
#	CHANGELOG.rst
#	_pytest/pytester.py 
							
						 
						
							2017-03-10 15:54:05 -03:00  
				
					
						
							
							
								 
						
							
								a88017cf26 
								
							 
						 
						
							
							
								
								Add note documenting  #2257  
							
							
							
						 
						
							2017-02-16 23:00:55 -07:00  
				
					
						
							
							
								 
						
							
								58d7f4e048 
								
							 
						 
						
							
							
								
								Correct typo  
							
							
							
						 
						
							2017-02-16 22:52:06 -07:00  
				
					
						
							
							
								 
						
							
								ede4e9171f 
								
							 
						 
						
							
							
								
								Spelling fixes  
							
							
							
						 
						
							2017-02-15 17:00:58 +02:00  
				
					
						
							
							
								 
						
							
								0e58c3fa80 
								
							 
						 
						
							
							
								
								updates for PR review  #2198  
							
							
							
						 
						
							2017-01-21 16:47:49 +13:00  
				
					
						
							
							
								 
						
							
								c848d0a771 
								
							 
						 
						
							
							
								
								Pass parameter name to `make_parametrize_id` hook function  
							
							
							
						 
						
							2017-01-21 16:46:45 +13:00  
				
					
						
							
							
								 
						
							
								5b95ee3c19 
								
							 
						 
						
							
							
								
								Pass exitstatus to pytest_terminal_summary hook  
							
							... 
							
							
							
							This is useful to know if a testrun has been interrupted
(EXIT_INTERRUPTED). 
							
						 
						
							2016-08-14 22:06:35 +02:00  
				
					
						
							
							
								 
						
							
								032ce8baf6 
								
							 
						 
						
							
							
								
								Switch setuponly and setupplan options to a hook-based implementation.  
							
							
							
						 
						
							2016-06-25 12:19:46 +02:00  
				
					
						
							
							
								 
						
							
								ef9dd14963 
								
							 
						 
						
							
							
								
								Introduce pytest command as recommended entry point  
							
							... 
							
							
							
							Fixes  #1629  
						
							2016-06-21 16:16:57 +02:00  
				
					
						
							
							
								 
						
							
								9733127951 
								
							 
						 
						
							
							
								
								pytest_make_parametrize_id receive config object  
							
							
							
						 
						
							2016-04-26 10:23:57 +03:00  
				
					
						
							
							
								 
						
							
								53429ed8b8 
								
							 
						 
						
							
							
								
								Added hook to plugin docs and new CHANGELOG record  
							
							
							
						 
						
							2016-04-25 18:03:34 +03:00  
				
					
						
							
							
								 
						
							
								79927428d1 
								
							 
						 
						
							
							
								
								Added pytest_make_parametrize_id hook  
							
							
							
						 
						
							2016-04-25 17:11:47 +03:00  
				
					
						
							
							
								 
						
							
								bdddc9c38b 
								
							 
						 
						
							
							
								
								doc: fix argument order for pytest_load_initial_conftests  
							
							
							
						 
						
							2016-03-12 17:35:27 +01:00  
				
					
						
							
							
								 
						
							
								819e0ead44 
								
							 
						 
						
							
							
								
								Mention that pytest_addoption may be used from conftest files  
							
							... 
							
							
							
							fix  #1427  
						
							2016-03-03 18:26:01 -03:00  
				
					
						
							
							
								 
						
							
								6c170201d6 
								
							 
						 
						
							
							
								
								Merge branch 'master' into features  
							
							
							
						 
						
							2016-01-02 23:56:01 +01:00  
				
					
						
							
							
								 
						
							
								2b2bec6b97 
								
							 
						 
						
							
							
								
								Remove experimental status from pytest_exception_interact  
							
							
							
						 
						
							2015-12-16 14:29:39 -02:00  
				
					
						
							
							
								 
						
							
								b20803f0a6 
								
							 
						 
						
							
							
								
								Mention pytest_enter_pdb in the docs  
							
							
							
						 
						
							2015-11-23 18:00:02 -02:00  
				
					
						
							
							
								 
						
							
								b3166a538c 
								
							 
						 
						
							
							
								
								Pass pytest's config object to pytest_enter_pdb  
							
							
							
						 
						
							2015-11-23 14:42:21 -02:00  
				
					
						
							
							
								 
						
							
								1f148a93ec 
								
							 
						 
						
							
							
								
								Mention pytest_enter_pdb in the docs  
							
							
							
						 
						
							2015-11-23 13:02:15 -02:00  
				
					
						
							
							
								 
						
							
								80897f62a6 
								
							 
						 
						
							
							
								
								Merge pull request  #974  from nicoddemus/addoption-conftest  
							
							... 
							
							
							
							Add warning about implementing pytest_addoption in conftest files 
							
						 
						
							2015-09-21 11:28:31 +01: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  
				
					
						
							
							
								 
						
							
								76f0988551 
								
							 
						 
						
							
							
								
								turn the pytest_logwarning hook historic  
							
							
							
						 
						
							2015-09-02 18:49:49 +02:00  
				
					
						
							
							
								 
						
							
								ccf7584fac 
								
							 
						 
						
							
							
								
								Add warning about implementing pytest_addoption from conftest files  
							
							
							
						 
						
							2015-08-27 19:14:56 -03: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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								d2a5c7f99b 
								
							 
						 
						
							
							
								
								add documented hookimpl_opts and hookspec_opts decorators  
							
							... 
							
							
							
							so that one doesn't have to use pytest.mark or function-attribute setting anymore
--HG--
branch : more_plugin 
							
						 
						
							2015-04-25 11:29:11 +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  
				
					
						
							
							
								 
						
							
								de83d35994 
								
							 
						 
						
							
							
								
								optimize argument slicing when calling plugin hooks  
							
							
							
						 
						
							2014-10-01 14:55:54 +02:00  
				
					
						
							
							
								 
						
							
								1408c9f077 
								
							 
						 
						
							
							
								
								Introduce pytest_enter_pdb hook  
							
							
							
						 
						
							2014-09-18 14:58:42 +02:00  
				
					
						
							
							
								 
						
							
								4bc4495115 
								
							 
						 
						
							
							
								
								Fixed typo noticed by @dcramer ( https://twitter.com/zeeg/status/473676721128886272 )  
							
							... 
							
							
							
							--HG--
branch : zyegfryed/fixed-typo-noticed-by-dcramer-httpstwitt-1401780587159 
							
						 
						
							2014-06-03 07:30:14 +00:00  
				
					
						
							
							
								 
						
							
								c66e9f8f0f 
								
							 
						 
						
							
							
								
								fix typo, thanks @dcramer  
							
							
							
						 
						
							2014-06-03 07:21:02 +02:00  
				
					
						
							
							
								 
						
							
								8f7b53e55b 
								
							 
						 
						
							
							
								
								fix issue490: include pytest_load_initial_conftests in documentation  
							
							... 
							
							
							
							and improve docstring. 
							
						 
						
							2014-03-25 14:43:58 +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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								ac19212b2d 
								
							 
						 
						
							
							
								
								remove very likely unused pytest_plugin_unregister hook (pytest itself and all plugins i know don't use it)  
							
							
							
						 
						
							2013-09-28 22:22:57 +02:00  
				
					
						
							
							
								 
						
							
								1fc466e8ac 
								
							 
						 
						
							
							
								
								add terminalreporter.section|line methods to print extra information.  
							
							
							
						 
						
							2013-09-27 15:48:03 +02:00  
				
					
						
							
							
								 
						
							
								94ee37cdb3 
								
							 
						 
						
							
							
								
								- fix issue181: --pdb now also works on collect errors.  This was  
							
							... 
							
							
							
							implemented by a slight internal refactoring and the introduction
  of a new hook ``pytest_exception_interact`` hook.
- fix issue341: introduce new experimental hook for IDEs/terminals to
  intercept debugging: ``pytest_exception_interact(node, call, report)``. 
							
						 
						
							2013-09-06 11:56:04 +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  
				
					
						
							
							
								 
						
							
								33cd414420 
								
							 
						 
						
							
							
								
								fix issue127 improve pytest_addoption docs, add new config.getoption(name) method for consistency.  
							
							
							
						 
						
							2012-11-06 14:09:12 +01:00  
				
					
						
							
							
								 
						
							
								b8277bfed8 
								
							 
						 
						
							
							
								
								fix issue127 - improve pytest_addoption and related documentation  
							
							
							
						 
						
							2012-10-25 11:07:07 +02:00  
				
					
						
							
							
								 
						
							
								ccc04b9fc4 
								
							 
						 
						
							
							
								
								some refinements to reporting and hook order  
							
							
							
						 
						
							2012-06-21 11:07:22 +02:00  
				
					
						
							
							
								 
						
							
								8307270cec 
								
							 
						 
						
							
							
								
								yay! now that we have perfect teardowns we don't need some ugly internal hooks anymore.  
							
							
							
						 
						
							2011-12-02 21:00:21 +00:00  
				
					
						
							
							
								 
						
							
								c4fe622b82 
								
							 
						 
						
							
							
								
								fix issue93 - avoid "delayed" teardowns for distributed testing by  
							
							... 
							
							
							
							simplifying handling of teardowns. 
							
						 
						
							2011-12-02 21:00:19 +00:00  
				
					
						
							
							
								 
						
							
								29bf205f3a 
								
							 
						 
						
							
							
								
								make --durations also show the execution times of setup/teardown calls. This requires a slight incompatibility - pytest_runtest_logreport now sees setup/teardown reports even if the tests passed.  
							
							
							
						 
						
							2011-11-08 17:53:46 +00:00  
				
					
						
							
							
								 
						
							
								ce1b456762 
								
							 
						 
						
							
							
								
								back out pytest_configure_funcargs hook for now  
							
							
							
						 
						
							2011-06-01 15:08:54 +02:00