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  
				
					
						
							
							
								 
						
							
								225341cf2c 
								
							 
						 
						
							
							
								
								Set wasxfail only for xpass w/o strict and else set longrepr  
							
							
							
						 
						
							2016-08-13 00:00:51 +01:00  
				
					
						
							
							
								 
						
							
								296f42a2c9 
								
							 
						 
						
							
							
								
								Treat unittest.expectedFailure pass as a failure  
							
							
							
						 
						
							2016-08-12 23:18:36 +01:00  
				
					
						
							
							
								 
						
							
								e4028b4505 
								
							 
						 
						
							
							
								
								Fix   #1798  to include errors in total tests in junit xml output.  
							
							
							
						 
						
							2016-08-08 13:35:49 +01:00  
				
					
						
							
							
								 
						
							
								99a4a1a784 
								
							 
						 
						
							
							
								
								Merge pull request  #1791  from nicoddemus/ide-integration-1790  
							
							... 
							
							
							
							Internal adjustments for easier integration with IDEs 
							
						 
						
							2016-08-07 23:50:50 +01: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  
				
					
						
							
							
								 
						
							
								4fc20d09fe 
								
							 
						 
						
							
							
								
								Change outcome to 'passed' for xfail unless it's strict  
							
							
							
						 
						
							2016-08-05 19:25:55 +01:00  
				
					
						
							
							
								 
						
							
								1a79137d04 
								
							 
						 
						
							
							
								
								Add originalname attribute to Function  
							
							... 
							
							
							
							Related to #1790  
							
						 
						
							2016-08-03 22:56:12 -03:00  
				
					
						
							
							
								 
						
							
								530b0050b4 
								
							 
						 
						
							
							
								
								Improve TestReport.sections docs a bit  
							
							... 
							
							
							
							Related to #1790  
							
						 
						
							2016-08-03 21:57:58 -03:00  
				
					
						
							
							
								 
						
							
								ff296fd541 
								
							 
						 
						
							
							
								
								Add capstdout and capstderr attrs to TestReport  
							
							... 
							
							
							
							Related to #1790  
							
						 
						
							2016-08-03 21:49:43 -03:00  
				
					
						
							
							
								 
						
							
								08002ab75a 
								
							 
						 
						
							
							
								
								Add longreprtext property to TestReport objects  
							
							... 
							
							
							
							Related to #1790  
							
						 
						
							2016-08-03 21:49:28 -03:00  
				
					
						
							
							
								 
						
							
								6711b1d6ab 
								
							 
						 
						
							
							
								
								Rewrite asserts in test-modules loaded very early in the startup  
							
							... 
							
							
							
							Also now match modules which start with any of the names registered
using register_assert_rewrite as discussed in #1787 
Fix  #1784  
							
						 
						
							2016-08-03 12:49:48 -03:00  
				
					
						
							
							
								 
						
							
								277b6d3974 
								
							 
						 
						
							
							
								
								Sort fixture names when a fixture lookup error occurs  
							
							
							
						 
						
							2016-08-02 19:45:31 -03:00  
				
					
						
							
							
								 
						
							
								ea6191a0cd 
								
							 
						 
						
							
							
								
								Merge pull request  #1779  from RonnyPfannschmidt/deselect-no-reason  
							
							... 
							
							
							
							terminal: dont pretend to know the deselection reason 
							
						 
						
							2016-08-02 08:38:17 -03:00  
				
					
						
							
							
								 
						
							
								553dc2600f 
								
							 
						 
						
							
							
								
								Strip invocation-scope suffix when displaying fixture lookup error  
							
							
							
						 
						
							2016-08-01 20:34:56 -03:00  
				
					
						
							
							
								 
						
							
								226f2795ba 
								
							 
						 
						
							
							
								
								Merge pull request  #1782  from nicoddemus/invocation-fixtures-help  
							
							... 
							
							
							
							invocation-scoped fixtures show up once with --fixtures 
							
						 
						
							2016-08-01 23:21:28 +01:00  
				
					
						
							
							
								 
						
							
								44ecf2ab2f 
								
							 
						 
						
							
							
								
								invocation-scoped fixtures show up once with --fixtures  
							
							
							
						 
						
							2016-08-01 18:48:29 -03:00  
				
					
						
							
							
								 
						
							
								3c8222f1db 
								
							 
						 
						
							
							
								
								Highlight the path of file location in error report  
							
							... 
							
							
							
							So that it's more obvious when we need to copy the file path. 
							
						 
						
							2016-08-01 17:42:20 -03:00  
				
					
						
							
							
								 
						
							
								ac215e9cff 
								
							 
						 
						
							
							
								
								terminal: dont pretend to know the deselection reason  
							
							... 
							
							
							
							this addresses #1372  - we pretend we know the deselection reason from internal plugins and ignore 3rd party/local reasons 
							
						 
						
							2016-08-01 13:50:59 +02:00  
				
					
						
							
							
								 
						
							
								aa145fa83e 
								
							 
						 
						
							
							
								
								Add 'invocation' scope option to fixture docstring  
							
							
							
						 
						
							2016-07-29 12:47:30 -03:00  
				
					
						
							
							
								 
						
							
								76fbc6379f 
								
							 
						 
						
							
							
								
								Fix deprecated directive in docstring  
							
							
							
						 
						
							2016-07-29 12:39:48 -03:00  
				
					
						
							
							
								 
						
							
								eaf8d9ce19 
								
							 
						 
						
							
							
								
								Set version to 3.0.0.dev1  
							
							... 
							
							
							
							For a long time now we've considering the next version to be 3.0.0 
							
						 
						
							2016-07-28 21:30:16 -03:00  
				
					
						
							
							
								 
						
							
								510a6083ba 
								
							 
						 
						
							
							
								
								Merge pull request  #1758  from nicoddemus/deprecated-module  
							
							... 
							
							
							
							Add deprecation module to centralize deprecation messages and bits of… 
							
						 
						
							2016-07-28 22:36:55 +01:00  
				
					
						
							
							
								 
						
							
								ed36d627e4 
								
							 
						 
						
							
							
								
								Use PyInstaller for freeze test env  
							
							... 
							
							
							
							cx_freeze doesn't seem to be very well supported in Python 3.5.
Using pyinstaller instead and rename environment to "freeze" which
is a more generic term for freezing python code into standalone
executables.
Fix  #1769  
							
						 
						
							2016-07-26 22:02:37 -03:00  
				
					
						
							
							
								 
						
							
								05728d1317 
								
							 
						 
						
							
							
								
								fix keep-duplicates help line.  
							
							
							
						 
						
							2016-07-26 09:53:12 +02:00  
				
					
						
							
							
								 
						
							
								c2864aba3d 
								
							 
						 
						
							
							
								
								Merge branch 'master' into merge-master  
							
							... 
							
							
							
							# Conflicts:
#	AUTHORS
#	CHANGELOG.rst
#	_pytest/monkeypatch.py
#	_pytest/python.py 
							
						 
						
							2016-07-25 19:06:29 -03:00  
				
					
						
							
							
								 
						
							
								9cf09cda7b 
								
							 
						 
						
							
							
								
								Remove some comments and improved changelog  
							
							
							
						 
						
							2016-07-25 18:41:03 -03:00  
				
					
						
							
							
								 
						
							
								d911bfcb8a 
								
							 
						 
						
							
							
								
								Merge branch 'issue634-scopes' of  https://github.com/Stranger6667/pytest  
							
							... 
							
							
							
							# Conflicts:
#	CHANGELOG.rst 
							
						 
						
							2016-07-25 18:26:50 -03:00  
				
					
						
							
							
								 
						
							
								8f29ce26e9 
								
							 
						 
						
							
							
								
								Merge branch 'mark_missing_fixture_error' of  https://github.com/eolo999/pytest  
							
							
							
						 
						
							2016-07-25 18:20:17 -03:00  
				
					
						
							
							
								 
						
							
								6c8b0a28e1 
								
							 
						 
						
							
							
								
								Add deprecation module to centralize deprecation messages and bits of code  
							
							
							
						 
						
							2016-07-25 18:14:39 -03:00  
				
					
						
							
							
								 
						
							
								d72afe7e08 
								
							 
						 
						
							
							
								
								Fixed scope override inside metafunc.parametrize.  Fixes   #634  
							
							
							
						 
						
							2016-07-25 12:42:50 +02:00  
				
					
						
							
							
								 
						
							
								ab6aef1d1f 
								
							 
						 
						
							
							
								
								feature: default behavior now is to ignore duplicate paths specified from the command line. Use --keep-duplicates to retain duplicate paths.  
							
							
							
						 
						
							2016-07-25 12:41:58 +02:00  
				
					
						
							
							
								 
						
							
								f7ad173fee 
								
							 
						 
						
							
							
								
								Fixed collection of classes with custom ``__new__`` method  
							
							
							
						 
						
							2016-07-25 11:33:37 +02:00  
				
					
						
							
							
								 
						
							
								a309a571d9 
								
							 
						 
						
							
							
								
								Cleanups for  #1763  
							
							
							
						 
						
							2016-07-25 10:17:46 +02:00  
				
					
						
							
							
								 
						
							
								a24146dd3c 
								
							 
						 
						
							
							
								
								Merge pull request  #1757  from tramwaj29/improved-message-when-not-using-parametrized-variable  
							
							... 
							
							
							
							Improved message when not using parametrized variable 
							
						 
						
							2016-07-24 13:02:03 -03:00  
				
					
						
							
							
								 
						
							
								42adaf5a61 
								
							 
						 
						
							
							
								
								Fix   #1210  display msg for early calls to exit  
							
							
							
						 
						
							2016-07-24 14:16:34 +02:00  
				
					
						
							
							
								 
						
							
								4aede6faa6 
								
							 
						 
						
							
							
								
								fixed conflicts  
							
							
							
						 
						
							2016-07-24 12:10:32 +02:00  
				
					
						
							
							
								 
						
							
								d000f2536a 
								
							 
						 
						
							
							
								
								added a test for when the indirect is just a string  
							
							
							
						 
						
							2016-07-24 10:47:06 +02:00  
				
					
						
							
							
								 
						
							
								5c5d7e05f7 
								
							 
						 
						
							
							
								
								Followup to  #1718 : style/formatting  
							
							
							
						 
						
							2016-07-24 00:21:42 +02:00  
				
					
						
							
							
								 
						
							
								6799a47c78 
								
							 
						 
						
							
							
								
								Start FixtureLookupErrorRepr with an 'E'  
							
							
							
						 
						
							2016-07-23 23:43:34 +02:00  
				
					
						
							
							
								 
						
							
								f26fa5a441 
								
							 
						 
						
							
							
								
								changed error message for unused parametrize name  
							
							
							
						 
						
							2016-07-23 16:49:20 +02:00  
				
					
						
							
							
								 
						
							
								94731fc2a1 
								
							 
						 
						
							
							
								
								Changes variable name so it better describes what it does now.  
							
							
							
						 
						
							2016-07-23 16:26:33 +02:00  
				
					
						
							
							
								 
						
							
								51fa244650 
								
							 
						 
						
							
							
								
								Cleaner implementation of  #1749 .  
							
							
							
						 
						
							2016-07-23 16:18:12 +02:00  
				
					
						
							
							
								 
						
							
								ec7695e15d 
								
							 
						 
						
							
							
								
								adds a bit of doctest hint on why the key and value getters are separate functions.  
							
							
							
						 
						
							2016-07-23 15:19:18 +02:00  
				
					
						
							
							
								 
						
							
								87ca4b95fb 
								
							 
						 
						
							
							
								
								Separate the option keys and value to avoid importing "doctest" (and tested things like "logging") for argument parsing ( fixes   #1749 )  
							
							
							
						 
						
							2016-07-23 14:50:24 +02:00  
				
					
						
							
							
								 
						
							
								fd8e019cc1 
								
							 
						 
						
							
							
								
								Choose the doctest output format in case of failure, still work in progress as a few checks fail (related to  #1749 )  
							
							
							
						 
						
							2016-07-23 14:40:46 +02:00  
				
					
						
							
							
								 
						
							
								625b603f1f 
								
							 
						 
						
							
							
								
								Implements an option to choose the doctest output format in case of failure. ( fixes   #1749 )  
							
							
							
						 
						
							2016-07-23 13:06:05 +02:00  
				
					
						
							
							
								 
						
							
								7e37497d5a 
								
							 
						 
						
							
							
								
								Uppercase first word in docstrings. Change to an imperative form. Add name to authors.  
							
							
							
						 
						
							2016-07-22 12:39:06 +02:00  
				
					
						
							
							
								 
						
							
								ae0798522f 
								
							 
						 
						
							
							
								
								Merge pull request  #1711  from nicoddemus/invocation-scoped-fixtures  
							
							... 
							
							
							
							Invocation scoped fixtures 
							
						 
						
							2016-07-21 19:48:52 -03:00  
				
					
						
							
							
								 
						
							
								4c112401c5 
								
							 
						 
						
							
							
								
								Log LineMatcher output in a stream instead of stderr  
							
							... 
							
							
							
							This makes the match/nomatch output appear as part
of the fnmatch_lines() error on pytest's output instead
of globbered together with general stdout/stderr capture 
							
						 
						
							2016-07-20 22:35:43 -03:00  
				
					
						
							
							
								 
						
							
								05f3422d7c 
								
							 
						 
						
							
							
								
								Make monkeypatch invocation-scoped  
							
							
							
						 
						
							2016-07-20 22:05:49 -03:00  
				
					
						
							
							
								 
						
							
								4f2bf965cb 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/features' into invocation-scoped-fixtures  
							
							
							
						 
						
							2016-07-20 21:16:27 -03:00  
				
					
						
							
							
								 
						
							
								20f97c3041 
								
							 
						 
						
							
							
								
								Small documentation improvements  
							
							
							
						 
						
							2016-07-20 20:22:28 -03:00  
				
					
						
							
							
								 
						
							
								e0f08a73ab 
								
							 
						 
						
							
							
								
								Merge branch 'features' into conftest-exception-printing  
							
							
							
						 
						
							2016-07-20 19:33:36 -03:00  
				
					
						
							
							
								 
						
							
								93aae987a2 
								
							 
						 
						
							
							
								
								Merge pull request  #1744  from RonnyPfannschmidt/existfirst-override  
							
							... 
							
							
							
							allow --exitfirst/-x to be overridden by a following --maxfail 
							
						 
						
							2016-07-20 18:16:07 -03:00  
				
					
						
							
							
								 
						
							
								9dadaa8a41 
								
							 
						 
						
							
							
								
								skipping plugin: remove python2.5 compat code  
							
							
							
						 
						
							2016-07-20 17:45:20 +02:00  
				
					
						
							
							
								 
						
							
								2a05c311e9 
								
							 
						 
						
							
							
								
								implement exitfirst as store_const option  
							
							... 
							
							
							
							this makes it possible to override with a later maxfail 
							
						 
						
							2016-07-20 17:15:29 +02:00  
				
					
						
							
							
								 
						
							
								61cc5c4d4e 
								
							 
						 
						
							
							
								
								argument parsing: always warn for string types  
							
							... 
							
							
							
							fix  #1741  
						
							2016-07-19 10:33:25 +02:00  
				
					
						
							
							
								 
						
							
								317b3f257d 
								
							 
						 
						
							
							
								
								optparse compatibility - add float and complex  
							
							... 
							
							
							
							also documents the implementation quality
fixes  #457  
							
						 
						
							2016-07-19 10:20:41 +02:00  
				
					
						
							
							
								 
						
							
								8a73a2ad60 
								
							 
						 
						
							
							
								
								Merge pull request  #1734  from nicoddemus/issue-1728-inconsistent-setup-teardown  
							
							... 
							
							
							
							setup_* and teardown_* functions argument now optional 
							
						 
						
							2016-07-15 14:59:22 +02:00  
				
					
						
							
							
								 
						
							
								ff8fb4950e 
								
							 
						 
						
							
							
								
								setup_* and teardown_* functions argument now optional  
							
							... 
							
							
							
							setup_module, setup_function and setup_method
extra argument are now optional and may be omitted.
Fix  #1728  
							
						 
						
							2016-07-14 23:41:40 -03:00  
				
					
						
							
							
								 
						
							
								d1852a48b7 
								
							 
						 
						
							
							
								
								Remove assertion reinterpretation  
							
							... 
							
							
							
							The assertion reinterpretation is an old backwards compatibility
mode which was no longer being maintained on feature-parity with
the assertion rewriting mode.  It was also responsible for some
dubious patching of builtins and test with side-effects would
suddenly start passing.  Since re-writing has been the default for
a long time and plugins are now also re-written it is time to
retire reinterpretation. 
							
						 
						
							2016-07-15 00:33:39 +01: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  
				
					
						
							
							
								 
						
							
								ab0b6faa5f 
								
							 
						 
						
							
							
								
								Deprecate support for passing command-line as string to pytest.main()  
							
							... 
							
							
							
							Fixes  #1723  
						
							2016-07-14 08:11:43 -03: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  
				
					
						
							
							
								 
						
							
								3cfebdd7c5 
								
							 
						 
						
							
							
								
								funcarg_prefix_warning: remove newline  
							
							... 
							
							
							
							Followup to https://github.com/pytest-dev/pytest/pull/1718 . 
							
						 
						
							2016-07-13 18:33:24 +02:00  
				
					
						
							
							
								 
						
							
								743f59afb2 
								
							 
						 
						
							
							
								
								Introduce pytest.register_assert_rewrite()  
							
							... 
							
							
							
							Plugins can now explicitly mark modules to be re-written.  By default
only the modules containing the plugin entrypoint are re-written. 
							
						 
						
							2016-07-13 17:31:09 +01:00  
				
					
						
							
							
								 
						
							
								944da5b98a 
								
							 
						 
						
							
							
								
								Avoid rewrite warning for inline runs  
							
							... 
							
							
							
							When running pytest inline/inprocess we plugins have already been
imported and re-writen, so avoid the warning. 
							
						 
						
							2016-07-13 17:29:19 +01: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  
				
					
						
							
							
								 
						
							
								15e97a7c78 
								
							 
						 
						
							
							
								
								Add punctuation to funcarg_prefix_warning  
							
							
							
						 
						
							2016-07-12 23:49:09 +02:00  
				
					
						
							
							
								 
						
							
								c4f20a1834 
								
							 
						 
						
							
							
								
								Merge pull request  #1712  from anntzer/custom-debugger  
							
							... 
							
							
							
							Allow passing a custom Pdb subclass via --pdbcls. 
							
						 
						
							2016-07-12 16:45:07 +02:00  
				
					
						
							
							
								 
						
							
								7ee3dd1cb5 
								
							 
						 
						
							
							
								
								Add tests for custom pdb class.  
							
							... 
							
							
							
							(and edit CHANGELOG) 
							
						 
						
							2016-07-11 20:07:29 -07:00  
				
					
						
							
							
								 
						
							
								458ecae1df 
								
							 
						 
						
							
							
								
								Replace all usages of "pytest_funcarg__" for @pytest.fixture  
							
							
							
						 
						
							2016-07-11 22:21:52 -03:00  
				
					
						
							
							
								 
						
							
								ad4125dc0d 
								
							 
						 
						
							
							
								
								Deprecate "pytest_funcarg__" prefix to declare fixtures  
							
							... 
							
							
							
							Fixes  #1684  
						
							2016-07-11 22:21:50 -03:00  
				
					
						
							
							
								 
						
							
								5506dc700c 
								
							 
						 
						
							
							
								
								Deprecate yield tests  
							
							... 
							
							
							
							Closes  #16 
Closes  #1324  
						
							2016-07-11 22:21:49 -03:00  
				
					
						
							
							
								 
						
							
								0ca06962e9 
								
							 
						 
						
							
							
								
								Improve docs  
							
							
							
						 
						
							2016-07-11 20:33:16 -03:00  
				
					
						
							
							
								 
						
							
								fb4da00a32 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/features' into invocation-scoped-fixtures  
							
							
							
						 
						
							2016-07-11 20:09:13 -03:00  
				
					
						
							
							
								 
						
							
								6383b53ad9 
								
							 
						 
						
							
							
								
								Allow passing a custom Pdb subclass via --pdbcls.  
							
							... 
							
							
							
							This obviates the need for plugins such as `pytest-ipdb`; instead one
can simply call `py.test --pdb=IPython.core.debugger:Pdb` 
							
						 
						
							2016-07-09 21:10:52 -07:00  
				
					
						
							
							
								 
						
							
								775100881a 
								
							 
						 
						
							
							
								
								Implement invocation-scoped fixtures  
							
							
							
						 
						
							2016-07-09 22:52:05 -03:00  
				
					
						
							
							
								 
						
							
								8c49561470 
								
							 
						 
						
							
							
								
								split most fixture related code into own plugin  
							
							
							
						 
						
							2016-07-09 20:36:00 +02: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  
				
					
						
							
							
								 
						
							
								61e605f60b 
								
							 
						 
						
							
							
								
								Making conftest import failures easier to debug  
							
							
							
						 
						
							2016-07-05 10:04:42 +01:00  
				
					
						
							
							
								 
						
							
								6438895a23 
								
							 
						 
						
							
							
								
								Fix PEP-8.  
							
							
							
						 
						
							2016-07-03 22:33:21 +02:00  
				
					
						
							
							
								 
						
							
								b650c3c118 
								
							 
						 
						
							
							
								
								Implement --setup-show cli flag  
							
							... 
							
							
							
							to also be able to see fixture setup with normal test execution. 
							
						 
						
							2016-07-03 22:30:51 +02:00  
				
					
						
							
							
								 
						
							
								58e558141d 
								
							 
						 
						
							
							
								
								Remove commented out code  
							
							
							
						 
						
							2016-06-26 21:19:07 +02:00  
				
					
						
							
							
								 
						
							
								5891061ac1 
								
							 
						 
						
							
							
								
								Merge pull request  #1675  from kvas-it/issue-1562  
							
							... 
							
							
							
							Add warning for assertions on tuples #1562  
							
						 
						
							2016-06-26 16:09:15 -03: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  
				
					
						
							
							
								 
						
							
								1ce4670062 
								
							 
						 
						
							
							
								
								* removed tailing whitespaces  
							
							
							
						 
						
							2016-06-26 06:51:57 +02:00  
				
					
						
							
							
								 
						
							
								c17027e576 
								
							 
						 
						
							
							
								
								Warn about asserts on tuples ( fixes   #1562 )  
							
							
							
						 
						
							2016-06-25 19:21:48 +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  
				
					
						
							
							
								 
						
							
								e2f550156e 
								
							 
						 
						
							
							
								
								Improve of the test output for logical expression with brackets.  
							
							... 
							
							
							
							Fixes  #925  
						
							2016-06-25 18:10:36 +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  
				
					
						
							
							
								 
						
							
								da5c579d82 
								
							 
						 
						
							
							
								
								Move setupplan and setuponly options to their respective modules.  
							
							... 
							
							
							
							Also, changed their group from "general" to "debugconfig". 
							
						 
						
							2016-06-25 12:20:56 +02:00  
				
					
						
							
							
								 
						
							
								032ce8baf6 
								
							 
						 
						
							
							
								
								Switch setuponly and setupplan options to a hook-based implementation.  
							
							
							
						 
						
							2016-06-25 12:19:46 +02:00  
				
					
						
							
							
								 
						
							
								05b5554cac 
								
							 
						 
						
							
							
								
								Renamed pytest pdb to debugging which conflicts with python pdb.  
							
							... 
							
							
							
							Combining multiple imports the "import pdb" imports the pytest module
as opposed to the python debugger. 
							
						 
						
							2016-06-25 12:09:05 +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  
				
					
						
							
							
								 
						
							
								d81f23009b 
								
							 
						 
						
							
							
								
								Raise CollectError if pytest.skip() is called during collection  
							
							... 
							
							
							
							pytest.skip() must not be used at module level because it can easily be
misunderstood and used as a decorator instead of pytest.mark.skip, causing the
whole module to be skipped instead of just the test being decorated.
This is unexpected for users used to the @unittest.skip decorator and therefore
it is best to bail out with a clean error when it happens.
The pytest equivalent of @unittest.skip is @pytest.mark.skip .
Adapt existing tests that were actually relying on this behaviour and add a
test that explicitly test that collection fails.
fix  #607  
							
						 
						
							2016-06-24 20:56:21 +02:00  
				
					
						
							
							
								 
						
							
								77689eb486 
								
							 
						 
						
							
							
								
								Fixes   #1503  no longer collapse false explanations  
							
							
							
						 
						
							2016-06-24 15:35:24 +02:00  
				
					
						
							
							
								 
						
							
								df9918eda3 
								
							 
						 
						
							
							
								
								issue1625, name getfuncargvalue to getfixturevalue  
							
							
							
						 
						
							2016-06-24 10:08:19 +02:00  
				
					
						
							
							
								 
						
							
								c6af737d4e 
								
							 
						 
						
							
							
								
								Fix fixture parameter display when ids is a function  
							
							
							
						 
						
							2016-06-23 10:54:22 +02:00  
				
					
						
							
							
								 
						
							
								1a5e530b98 
								
							 
						 
						
							
							
								
								Fix capturing with --setup-only/--setup-plan  
							
							
							
						 
						
							2016-06-23 10:23:04 +02:00  
				
					
						
							
							
								 
						
							
								69bab4ab04 
								
							 
						 
						
							
							
								
								added check for already existing option names to OptionGroup.addoption()  
							
							
							
						 
						
							2016-06-22 18:01:35 +02:00  
				
					
						
							
							
								 
						
							
								dd97a2e7c8 
								
							 
						 
						
							
							
								
								Merge from upstream  
							
							
							
						 
						
							2016-06-22 17:51:48 +02:00  
				
					
						
							
							
								 
						
							
								61992b4e22 
								
							 
						 
						
							
							
								
								Implement --setup-plan option  
							
							
							
						 
						
							2016-06-22 16:45:36 +02:00  
				
					
						
							
							
								 
						
							
								18ef7de96b 
								
							 
						 
						
							
							
								
								merge from master again  
							
							
							
						 
						
							2016-06-22 16:03:52 +02:00  
				
					
						
							
							
								 
						
							
								5e0d78f4f1 
								
							 
						 
						
							
							
								
								Fix .format string failures on python 2.6  
							
							
							
						 
						
							2016-06-22 14:53:37 +02:00  
				
					
						
							
							
								 
						
							
								083f64100d 
								
							 
						 
						
							
							
								
								merge master into features  
							
							
							
						 
						
							2016-06-22 14:39:33 +02:00  
				
					
						
							
							
								 
						
							
								2c5c4f3f78 
								
							 
						 
						
							
							
								
								Add printing of fixture dependencies  
							
							
							
						 
						
							2016-06-22 12:54:36 +02:00  
				
					
						
							
							
								 
						
							
								2c6cfa42fa 
								
							 
						 
						
							
							
								
								Disable capturing for setuponly output  
							
							
							
						 
						
							2016-06-22 12:14:35 +02:00  
				
					
						
							
							
								 
						
							
								de9ed5e3f4 
								
							 
						 
						
							
							
								
								Merge pull request  #1  from kvas-it/features  
							
							... 
							
							
							
							Factor setuponly code out of runtestprotocol(). 
							
						 
						
							2016-06-22 12:04:45 +02:00  
				
					
						
							
							
								 
						
							
								92bcc36266 
								
							 
						 
						
							
							
								
								Refactor logging of fixtures  
							
							
							
						 
						
							2016-06-22 12:01:51 +02:00  
				
					
						
							
							
								 
						
							
								6874c3a3cc 
								
							 
						 
						
							
							
								
								Factor setuponly code out of runtestprotocol().  
							
							
							
						 
						
							2016-06-22 11:09:54 +02:00  
				
					
						
							
							
								 
						
							
								98adf204b2 
								
							 
						 
						
							
							
								
								issue 1553: Include terminal newlines in diffs  
							
							
							
						 
						
							2016-06-22 09:50:15 +02:00  
				
					
						
							
							
								 
						
							
								499c9551c8 
								
							 
						 
						
							
							
								
								Implement working version of --setuponly  
							
							
							
						 
						
							2016-06-22 09:42:45 +02:00  
				
					
						
							
							
								 
						
							
								c3ee1c17bc 
								
							 
						 
						
							
							
								
								Merge pull request  #1620  from tomviner/issue460/parameterized-subrequest  
							
							... 
							
							
							
							Issue 460: Fail on getfuncargvalue(<fixture with params>) 
							
						 
						
							2016-06-21 13:43:06 -03:00  
				
					
						
							
							
								 
						
							
								4350f499b2 
								
							 
						 
						
							
							
								
								Merge branch 'issue1629' of  https://github.com/davehunt/pytest  into features  
							
							
							
						 
						
							2016-06-21 18:37:14 +02:00  
				
					
						
							
							
								 
						
							
								61ede096a3 
								
							 
						 
						
							
							
								
								Merge pull request  #1631  from Avira/master  
							
							... 
							
							
							
							help the user in the rare case this assertion actually fails 
							
						 
						
							2016-06-21 13:17:52 -03:00  
				
					
						
							
							
								 
						
							
								573866bfad 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/features' into issue-1619-conftest-assert-rewrite  
							
							
							
						 
						
							2016-06-21 18:10:19 +02:00  
				
					
						
							
							
								 
						
							
								ef9dd14963 
								
							 
						 
						
							
							
								
								Introduce pytest command as recommended entry point  
							
							... 
							
							
							
							Fixes  #1629  
						
							2016-06-21 16:16:57 +02:00  
				
					
						
							
							
								 
						
							
								2b5c2f3ed5 
								
							 
						 
						
							
							
								
								help the user in the rare case this assertion actually fails  
							
							
							
						 
						
							2016-06-21 14:57:48 +02:00  
				
					
						
							
							
								 
						
							
								ede7478dcc 
								
							 
						 
						
							
							
								
								Exit pytest on collection error (without executing tests)  
							
							... 
							
							
							
							Add --continue-on-collection-errors option to restore the previous behaviour:
Execute tests (that were successfully collected) even when collection errors
happen.
Some tests had to be modified e.g. because the return code changed to 2
(EXIT_INTERRUPTED) instead of 1 (EXIT_TESTSFAILED) because an Interrupted
exception is raised on collection error.
Implemented via pair programming with:
    Oleg Pidsadnyi <oleg.pidsadnyi@gmail.com>
closes  #1421  
							
						 
						
							2016-06-21 13:32:34 +02:00  
				
					
						
							
							
								 
						
							
								819942e964 
								
							 
						 
						
							
							
								
								Return explicit None from rewrite hook's find_module  
							
							
							
						 
						
							2016-06-21 12:28:36 +02:00  
				
					
						
							
							
								 
						
							
								8b0fb47c79 
								
							 
						 
						
							
							
								
								Remove print left by accident  
							
							
							
						 
						
							2016-06-21 12:23:12 +02:00  
				
					
						
							
							
								 
						
							
								5854a71ece 
								
							 
						 
						
							
							
								
								Issue 460: getfuncargvalue fixture w. params err  
							
							
							
						 
						
							2016-06-21 11:29:21 +02:00  
				
					
						
							
							
								 
						
							
								9118c0222f 
								
							 
						 
						
							
							
								
								Merge .set_config() into constructor  
							
							
							
						 
						
							2016-06-21 09:28:10 +02:00  
				
					
						
							
							
								 
						
							
								e53e45b55c 
								
							 
						 
						
							
							
								
								tests: getexecutable: call `--version` on all Pythons  
							
							... 
							
							
							
							This should prevent errors from pyenv:
    pyenv: python2.6: command not found
    The `python2.6' command exists in these Python versions:
      2.6.9
While the pyenv wrapper explicitly returns 127, I think it is better to
just check for non-zero?! 
							
						 
						
							2016-06-21 08:36:02 +02:00  
				
					
						
							
							
								 
						
							
								3a81d2e012 
								
							 
						 
						
							
							
								
								conftest files now use assertion rewriting  
							
							... 
							
							
							
							Fix  #1619  
						
							2016-06-20 23:13:29 +02:00  
				
					
						
							
							
								 
						
							
								4f2db6c08d 
								
							 
						 
						
							
							
								
								Merge pull request  #1616  from palaviv/pytest.raises-message  
							
							... 
							
							
							
							Pytest.raises custom error message 
							
						 
						
							2016-06-20 18:43:12 +02:00  
				
					
						
							
							
								 
						
							
								f8d4cadc3d 
								
							 
						 
						
							
							
								
								Added versionchanged directives  
							
							
							
						 
						
							2016-06-19 23:56:43 +03:00  
				
					
						
							
							
								 
						
							
								c29130d400 
								
							 
						 
						
							
							
								
								Updated documentation  
							
							
							
						 
						
							2016-06-19 23:34:42 +03:00  
				
					
						
							
							
								 
						
							
								ca093673fb 
								
							 
						 
						
							
							
								
								pytest.raises accept cutom message only when used as context manager  
							
							
							
						 
						
							2016-06-19 21:24:47 +03:00  
				
					
						
							
							
								 
						
							
								d81ee9acfb 
								
							 
						 
						
							
							
								
								Merge pull request  #1597  from taschini/pyargs-fix  
							
							... 
							
							
							
							Ensure that a module within a namespace package can be found by --pyargs 
							
						 
						
							2016-06-19 14:20:52 -03:00  
				
					
						
							
							
								 
						
							
								72bf11cbe9 
								
							 
						 
						
							
							
								
								Add disabled() method to capsys and capfd  
							
							... 
							
							
							
							Fix  #1599  
						
							2016-06-19 19:14:36 +02:00  
				
					
						
							
							
								 
						
							
								d21886c005 
								
							 
						 
						
							
							
								
								pytest.raises accpets custom message  
							
							
							
						 
						
							2016-06-16 20:15:32 +03:00  
				
					
						
							
							
								 
						
							
								ab8b2e75a3 
								
							 
						 
						
							
							
								
								Simplify default pytest_runtestloop  
							
							... 
							
							
							
							The inner function and the explanatory comment it makes necessary can
all be removed if we switch to an if/else rather than try/except for
this condition.
Perhaps this bit comes from my fondness for C, but I think I would
find this style clearer and easier to understand even if it weren't
for the Python 2 quirk that makes the other style require us to add an
unnecessary-looking function abstraction.  In any case, given that the
alternative does require that abstraction this is definitely simpler. 
							
						 
						
							2016-06-15 18:27:08 -07:00  
				
					
						
							
							
								 
						
							
								308396ae3c 
								
							 
						 
						
							
							
								
								Merge pull request  #1606  from hackebrot/show-fixtures-per-test  
							
							... 
							
							
							
							Show fixtures per test 
							
						 
						
							2016-06-14 09:54:18 -03:00  
				
					
						
							
							
								 
						
							
								4d9e293b4d 
								
							 
						 
						
							
							
								
								Incorporated feedback ( #1597 ).  
							
							... 
							
							
							
							Fixed problem caused in a test on Windows by file left open by PyPy and not immediately garbage collected. 
							
						 
						
							2016-06-14 07:12:40 +02:00  
				
					
						
							
							
								 
						
							
								e2e6e31711 
								
							 
						 
						
							
							
								
								Ensure that a module within a namespace package can be found by --pyargs.  
							
							
							
						 
						
							2016-06-14 07:12:40 +02:00  
				
					
						
							
							
								 
						
							
								adc50ac72f 
								
							 
						 
						
							
							
								
								Change format for test function locations  
							
							
							
						 
						
							2016-06-12 15:58:32 +01:00  
				
					
						
							
							
								 
						
							
								accd962c9f 
								
							 
						 
						
							
							
								
								Fixed issue shadowing error when missing argument on teardown_method  
							
							... 
							
							
							
							When the method argument is missing on teardown_method, the traceback is
100% internal to pytest, which with default options get pruned. Then
that traceback is empty, leading to a new exception as a traceback shall
not be empty.
This PR fixes that issue by pushing back the last stack on the
traceback, when the stacktrace is empty after pruning. Then the output
is still pruned, but gives meaningful information with the item where it
failed on the stack.
* fixes issue #1604 
Signed-off-by: Guyzmo <guyzmo+github@m0g.net> 
							
						 
						
							2016-06-12 03:45:24 +02:00  
				
					
						
							
							
								 
						
							
								b99aace8a9 
								
							 
						 
						
							
							
								
								Fix py26 by using indices in str.format  
							
							
							
						 
						
							2016-06-12 00:52:03 +01:00  
				
					
						
							
							
								 
						
							
								7eea168106 
								
							 
						 
						
							
							
								
								Implement show_fixtures_per_test and add cli flag  
							
							
							
						 
						
							2016-06-12 00:20:06 +01:00  
				
					
						
							
							
								 
						
							
								bdc29968b8 
								
							 
						 
						
							
							
								
								Remove dead code and simplify code in call_fixture_func  
							
							
							
						 
						
							2016-06-08 21:07:56 -03:00  
				
					
						
							
							
								 
						
							
								98acda426f 
								
							 
						 
						
							
							
								
								Remove yieldctx variable being passed around  
							
							
							
						 
						
							2016-06-08 21:07:50 -03:00  
				
					
						
							
							
								 
						
							
								d712428d33 
								
							 
						 
						
							
							
								
								Fix custom name for yield_fixtures  
							
							
							
						 
						
							2016-06-08 21:07:49 -03:00  
				
					
						
							
							
								 
						
							
								366879db27 
								
							 
						 
						
							
							
								
								Make normal fixtures work with "yield"  
							
							
							
						 
						
							2016-06-08 21:07:47 -03:00  
				
					
						
							
							
								 
						
							
								09d163aa3a 
								
							 
						 
						
							
							
								
								[exception handling] Fix case the current working directory (CWD) gets deleted during testing.  
							
							... 
							
							
							
							Fixes  #1235 . 
						
							2016-06-08 15:18:23 +02:00  
				
					
						
							
							
								 
						
							
								74862b8f2f 
								
							 
						 
						
							
							
								
								Don't mark empty doctest files as skipped,  fixes   #1578  
							
							
							
						 
						
							2016-06-01 19:19:14 +01:00  
				
					
						
							
							
								 
						
							
								fad6266a47 
								
							 
						 
						
							
							
								
								finish up the version bump in __init__ i forgot  
							
							
							
						 
						
							2016-06-01 08:18:10 +02:00  
				
					
						
							
							
								 
						
							
								b5bd4d959d 
								
							 
						 
						
							
							
								
								merge master to features  
							
							
							
						 
						
							2016-06-01 08:13:26 +02:00  
				
					
						
							
							
								 
						
							
								85541113eb 
								
							 
						 
						
							
							
								
								update version  
							
							
							
						 
						
							2016-05-31 19:05:36 +02:00  
				
					
						
							
							
								 
						
							
								0d80a9c729 
								
							 
						 
						
							
							
								
								Change _showfixtures_main to loop over fixturedefs  
							
							
							
						 
						
							2016-05-31 11:47:16 +01:00  
				
					
						
							
							
								 
						
							
								158f3cfaea 
								
							 
						 
						
							
							
								
								merge master  
							
							
							
						 
						
							2016-05-31 11:24:53 +02:00  
				
					
						
							
							
								 
						
							
								afc5c7e4f6 
								
							 
						 
						
							
							
								
								better message for empty argument skip  
							
							... 
							
							
							
							include the argument names to help determining the fixture/parametrization 
							
						 
						
							2016-05-30 14:42:55 +02:00  
				
					
						
							
							
								 
						
							
								03eb9203fd 
								
							 
						 
						
							
							
								
								remove the old empty argument triggers  
							
							... 
							
							
							
							unlike the marker based one its not composable 
							
						 
						
							2016-05-30 14:41:00 +02:00  
				
					
						
							
							
								 
						
							
								d217b52508 
								
							 
						 
						
							
							
								
								fix   #510  by adding a describing skip marker on empty parameterize  
							
							
							
						 
						
							2016-05-30 14:34:38 +02:00  
				
					
						
							
							
								 
						
							
								8c1be624a6 
								
							 
						 
						
							
							
								
								Merge pull request  #1554  from RonnyPfannschmidt/merge-master  
							
							... 
							
							
							
							Merge master into features 
							
						 
						
							2016-05-24 11:09:33 -03:00  
				
					
						
							
							
								 
						
							
								16794feaf6 
								
							 
						 
						
							
							
								
								Merge branch 'master' into merge-master  
							
							
							
						 
						
							2016-05-24 08:15:10 +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  
				
					
						
							
							
								 
						
							
								5ab5a11544 
								
							 
						 
						
							
							
								
								Merge pull request  #1565  from tomviner/issue1544/ignore-build-dist-dirs  
							
							... 
							
							
							
							Issue 1544: norecursedirs build & dist dirs 
							
						 
						
							2016-05-23 19:30:20 -03:00  
				
					
						
							
							
								 
						
							
								d6dfb1a393 
								
							 
						 
						
							
							
								
								issue 1544: norecursedirs build & dist dirs  
							
							
							
						 
						
							2016-05-23 21:02:29 +01:00  
				
					
						
							
							
								 
						
							
								d4c9fa9f1a 
								
							 
						 
						
							
							
								
								unittest.UnitTestCase: Allow __test__ for methods  
							
							... 
							
							
							
							__test__ needs to be checked for methods of a class too. Earlier,
this was not done, and all methods in a class was assumed to be
a test. This commit adds the appropriate condition to ensure that
if the __test__ is set to False, it does not collect that method.
Fixes https://github.com/pytest-dev/pytest/issues/1558  
							
						 
						
							2016-05-19 08:19:57 +05:30  
				
					
						
							
							
								 
						
							
								eab762ea99 
								
							 
						 
						
							
							
								
								Merge branch 'master' into merge-master  
							
							
							
						 
						
							2016-05-13 19:37:41 +02:00  
				
					
						
							
							
								 
						
							
								c49863aa63 
								
							 
						 
						
							
							
								
								merge next chunk from master and fix changelog linting issue  
							
							
							
						 
						
							2016-05-13 19:36:47 +02:00  
				
					
						
							
							
								 
						
							
								01d2ff804b 
								
							 
						 
						
							
							
								
								Merge commit '56156bb119194014129ac08c4a2c370f0b893104' into merge-master  
							
							
							
						 
						
							2016-05-13 17:55:02 +02:00  
				
					
						
							
							
								 
						
							
								0d07b64571 
								
							 
						 
						
							
							
								
								Fixes Issue 1549  
							
							
							
						 
						
							2016-05-05 11:29:05 -07:00  
				
					
						
							
							
								 
						
							
								75abfbe8d4 
								
							 
						 
						
							
							
								
								Fix typo in doc  
							
							
							
						 
						
							2016-04-28 14:40:17 +10:00  
				
					
						
							
							
								 
						
							
								6cc56b4a1b 
								
							 
						 
						
							
							
								
								Merge pull request  #1535  from palaviv/parametrize-test-ids-hook  
							
							... 
							
							
							
							introduce pytest_make_parametrize_id hook 
							
						 
						
							2016-04-27 16:16:16 +02:00  
				
					
						
							
							
								 
						
							
								9733127951 
								
							 
						 
						
							
							
								
								pytest_make_parametrize_id receive config object  
							
							
							
						 
						
							2016-04-26 10:23:57 +03:00  
				
					
						
							
							
								 
						
							
								fdee88f086 
								
							 
						 
						
							
							
								
								Merge pull request  #1520  from omarkohl/invalid_test_module_name  
							
							... 
							
							
							
							Raise CollectError if import test module fails 
							
						 
						
							2016-04-25 21:42:41 -03:00  
				
					
						
							
							
								 
						
							
								53429ed8b8 
								
							 
						 
						
							
							
								
								Added hook to plugin docs and new CHANGELOG record  
							
							
							
						 
						
							2016-04-25 18:03:34 +03:00  
				
					
						
							
							
								 
						
							
								b9faf78d51 
								
							 
						 
						
							
							
								
								Added test_pytest_make_parametrize_id  
							
							
							
						 
						
							2016-04-25 17:48:28 +03:00  
				
					
						
							
							
								 
						
							
								79927428d1 
								
							 
						 
						
							
							
								
								Added pytest_make_parametrize_id hook  
							
							
							
						 
						
							2016-04-25 17:11:47 +03:00  
				
					
						
							
							
								 
						
							
								56855893ca 
								
							 
						 
						
							
							
								
								Raise CollectError if import test module fails  
							
							... 
							
							
							
							One of the reasons for failing to import the test module is invalid Python
identifiers in the full package path of the test module.
fix  #1426  
							
						 
						
							2016-04-23 13:50:48 +02:00  
				
					
						
							
							
								 
						
							
								6d661ace0a 
								
							 
						 
						
							
							
								
								Merge pull request  #1523  from MengJueM/master  
							
							
							
						 
						
							2016-04-20 16:55:31 +02:00  
				
					
						
							
							
								 
						
							
								aa87395c39 
								
							 
						 
						
							
							
								
								Use py.builtin.callable  
							
							... 
							
							
							
							This restores compatibility with Python 3.0/3.1 
							
						 
						
							2016-04-20 11:18:47 +02:00  
				
					
						
							
							
								 
						
							
								75160547f2 
								
							 
						 
						
							
							
								
								Use a callable __tracebackhide__ for filtering  
							
							... 
							
							
							
							While this leads to slightly more complicated user code for the common
case (checking if the exception is of a given type) it's easier to
implement and more flexible. 
							
						 
						
							2016-04-20 11:09:27 +02:00  
				
					
						
							
							
								 
						
							
								b607f6728f 
								
							 
						 
						
							
							
								
								Filter selectively with __tracebackhide__  
							
							... 
							
							
							
							When __tracebackhide__ gets set to an exception type or list/tuple of
exception types, only those exceptions get filtered, while the full
traceback is shown if another exception (e.g. a bug in a assertion
helper) happens. 
							
						 
						
							2016-04-20 10:25:33 +02:00  
				
					
						
							
							
								 
						
							
								c24e8e01b4 
								
							 
						 
						
							
							
								
								Fix TracebackItem documentation in pytest.code  
							
							... 
							
							
							
							The TracebackItem class does not exist, but it seems the docstrings refer to
TracebackEntry. 
							
						 
						
							2016-04-20 08:35:17 +02:00  
				
					
						
							
							
								 
						
							
								1a37035d71 
								
							 
						 
						
							
							
								
								Add test test_absolute_win32_path  
							
							
							
						 
						
							2016-04-20 01:27:37 +08:00  
				
					
						
							
							
								 
						
							
								99c4b6fdc3 
								
							 
						 
						
							
							
								
								issue 1496 - xfail with condition keyword  
							
							
							
						 
						
							2016-04-19 18:12:37 +01:00  
				
					
						
							
							
								 
						
							
								dd2425675b 
								
							 
						 
						
							
							
								
								Fix a small issue about shlex.split not working well with win32 path  
							
							
							
						 
						
							2016-04-19 13:08:08 +08:00  
				
					
						
							
							
								 
						
							
								7ce5873da2 
								
							 
						 
						
							
							
								
								Perform a "unicode aware" check for maximum recursion depth error  
							
							... 
							
							
							
							Avoid errors `UnicodeErrosr`s due non maximum recursion depth errors
when checking for those errors. 
							
						 
						
							2016-04-08 23:32:18 -03:00  
				
					
						
							
							
								 
						
							
								0f7aeafe7c 
								
							 
						 
						
							
							
								
								Merge pull request  #1486  from roolebo/fix-issue-138  
							
							... 
							
							
							
							Fix issue #138  - support chained exceptions 
							
						 
						
							2016-04-03 19:21:57 +02:00  
				
					
						
							
							
								 
						
							
								e3bc6faa2b 
								
							 
						 
						
							
							
								
								Merge pull request  #1470  from ceridwen/features  
							
							... 
							
							
							
							Escape both bytes and unicode strings for "ids" in Metafunc.parametrize 
							
						 
						
							2016-04-03 13:48:30 -03:00  
				
					
						
							
							
								 
						
							
								c578226d43 
								
							 
						 
						
							
							
								
								Implement ExceptionInfo.match() to match regexp on str(exception)  
							
							... 
							
							
							
							This implements similar functionality to
unittest.TestCase.assertRegexpMatches()
closes  #372  
							
						 
						
							2016-04-03 11:22:44 +02:00  
				
					
						
							
							
								 
						
							
								23a8e2b469 
								
							 
						 
						
							
							
								
								Add .hypothesis to .gitignore and try an older version of Hypothesis for 2.6  
							
							
							
						 
						
							2016-04-02 11:47:37 -04:00  
				
					
						
							
							
								 
						
							
								491b30c5d9 
								
							 
						 
						
							
							
								
								Add Hypothesis test for _idval and fix bug it found  
							
							
							
						 
						
							2016-04-01 22:45:44 -04:00  
				
					
						
							
							
								 
						
							
								053c052190 
								
							 
						 
						
							
							
								
								Always lstrip() keyword expression  
							
							
							
						 
						
							2016-04-01 13:10:05 -04:00  
				
					
						
							
							
								 
						
							
								9b438d56e8 
								
							 
						 
						
							
							
								
								Fix a test_unicode_idval_python2 (now test_unicode_idval) and associated string handling on Python 3  
							
							
							
						 
						
							2016-04-01 12:27:17 -04:00  
				
					
						
							
							
								 
						
							
								89df701ae9 
								
							 
						 
						
							
							
								
								Comment a workaround for  #1485 .  
							
							
							
						 
						
							2016-03-27 13:15:56 +03:00  
				
					
						
							
							
								 
						
							
								c66aedfa65 
								
							 
						 
						
							
							
								
								checking first there are duplciates ids before changing to unique names  
							
							
							
						 
						
							2016-03-23 18:47:27 +02:00  
				
					
						
							
							
								 
						
							
								b8c15a0215 
								
							 
						 
						
							
							
								
								improved idmaker name selection in case of duplicate ids  
							
							
							
						 
						
							2016-03-23 00:20:58 +02:00  
				
					
						
							
							
								 
						
							
								1f46015de5 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/features' into features  
							
							
							
						 
						
							2016-03-22 16:22:00 -04:00  
				
					
						
							
							
								 
						
							
								653a53226a 
								
							 
						 
						
							
							
								
								Add strict parameter to xfail marker doc  
							
							
							
						 
						
							2016-03-22 16:01:51 +04:00  
				
					
						
							
							
								 
						
							
								1fbd19b8cb 
								
							 
						 
						
							
							
								
								Fix pytest.mark.skip mark when used in strict mode  
							
							
							
						 
						
							2016-03-22 15:40:34 +04:00  
				
					
						
							
							
								 
						
							
								4405dd0ffe 
								
							 
						 
						
							
							
								
								Escape both bytes and unicode strings for "ids" in Metafunc.parametrize  
							
							
							
						 
						
							2016-03-22 01:31:48 -04:00  
				
					
						
							
							
								 
						
							
								7885e43b78 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/features' into allow-none-as-parametrized-test-id  
							
							
							
						 
						
							2016-03-20 18:57:17 +02:00  
				
					
						
							
							
								 
						
							
								32f44ce2fd 
								
							 
						 
						
							
							
								
								updated parametrize documentation  
							
							
							
						 
						
							2016-03-20 18:54:48 +02:00  
				
					
						
							
							
								 
						
							
								a736e26734 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'pytest-dev/master' into fix-issue-138  
							
							
							
						 
						
							2016-03-20 01:04:22 +03:00  
				
					
						
							
							
								 
						
							
								fbc5ba08d9 
								
							 
						 
						
							
							
								
								Fix issue  #138  
							
							
							
						 
						
							2016-03-20 01:02:17 +03:00  
				
					
						
							
							
								 
						
							
								be1954afbc 
								
							 
						 
						
							
							
								
								allow None to be passed in ids list for specific test and recieve idmaker name for test  
							
							
							
						 
						
							2016-03-19 21:22:49 +02:00  
				
					
						
							
							
								 
						
							
								5fcce8a7d6 
								
							 
						 
						
							
							
								
								Merge branch 'master' into merge-master-into-features  
							
							
							
						 
						
							2016-03-18 18:26:56 -03:00  
				
					
						
							
							
								 
						
							
								a70e92777f 
								
							 
						 
						
							
							
								
								Bump version to 2.9.2.dev1  
							
							
							
						 
						
							2016-03-18 18:24:24 -03:00  
				
					
						
							
							
								 
						
							
								9bdf51fcc5 
								
							 
						 
						
							
							
								
								Bump version to 2.9.1  
							
							
							
						 
						
							2016-03-17 17:03:46 -04:00  
				
					
						
							
							
								 
						
							
								fa6acdcfd4 
								
							 
						 
						
							
							
								
								junitxml: add properties node in testsuite level  
							
							... 
							
							
							
							The commit allow users to add a properties node in testsuite level see
example below:
<testsuite errors="0" failures="0" name="pytest" skips="1" tests="1"
time="11.824">
  <properties>
    <property name="ARCH" value="PPC"/>
    <property name="OS" value="RHEL 7.2"/>
    <property name="TestPlanURL" value="https://url .."/>
    <property name="Automated" value="True"/>
  </properties>
  <testcase classname="git.....>
  </testcase>
</testsuite>
The current situation is that properties node can be added to every
testcase node. However, sometimes we need some global properties that
applies to all testcases and give better description for the testsuite
itself. 
							
						 
						
							2016-03-16 13:24:33 +02:00  
				
					
						
							
							
								 
						
							
								d70596da91 
								
							 
						 
						
							
							
								
								Merge pull request  #1452  from palaviv/specify-paramterized-node-in-command-line  
							
							... 
							
							
							
							Specify paramterized node in command line - fixes  #649  
							
						 
						
							2016-03-16 11:16:54 +01:00  
				
					
						
							
							
								 
						
							
								a1277aaf0e 
								
							 
						 
						
							
							
								
								added TODO comment to remove the parametrized workaround  
							
							
							
						 
						
							2016-03-15 23:42:25 +02:00  
				
					
						
							
							
								 
						
							
								5ceee08590 
								
							 
						 
						
							
							
								
								Fix CHANGELOG merge conflicts.  
							
							
							
						 
						
							2016-03-14 11:55:50 -07:00  
				
					
						
							
							
								 
						
							
								0dcc862a56 
								
							 
						 
						
							
							
								
								Fix some typos in the documentation.  
							
							
							
						 
						
							2016-03-14 11:38:00 -07:00  
				
					
						
							
							
								 
						
							
								9e7206a1cf 
								
							 
						 
						
							
							
								
								Fix a few stylistic issues.  
							
							
							
						 
						
							2016-03-14 11:29:45 -07:00  
				
					
						
							
							
								 
						
							
								1ee3d40dbe 
								
							 
						 
						
							
							
								
								allow parametrized nodes to be specified from command line  
							
							
							
						 
						
							2016-03-13 23:37:21 +02:00  
				
					
						
							
							
								 
						
							
								bdddc9c38b 
								
							 
						 
						
							
							
								
								doc: fix argument order for pytest_load_initial_conftests  
							
							
							
						 
						
							2016-03-12 17:35:27 +01:00  
				
					
						
							
							
								 
						
							
								916c0a8b36 
								
							 
						 
						
							
							
								
								Fix Decimal() and __ne__() errors.  
							
							
							
						 
						
							2016-03-11 16:29:18 -08:00  
				
					
						
							
							
								 
						
							
								078448008c 
								
							 
						 
						
							
							
								
								Discuss alternative float comparison algorithms.  
							
							
							
						 
						
							2016-03-11 15:59:48 -08:00  
				
					
						
							
							
								 
						
							
								42a7e0488d 
								
							 
						 
						
							
							
								
								Properly handle inf, nan, and built-in numeric types.  
							
							... 
							
							
							
							This commit also:
- Dramatically increases the number of unit tests , mostly by borrowing
  from the standard  library's unit tests for math.isclose().
- Refactors approx() into two classes, one of which handles comparing
  individual numbers (ApproxNonIterable) and another which uses the
  first to compare individual numbers or sequences of numbers. 
							
						 
						
							2016-03-11 08:49:26 -08:00  
				
					
						
							
							
								 
						
							
								4636bf6160 
								
							 
						 
						
							
							
								
								Merge pull request  #1391  from malinoff/issue1342  
							
							... 
							
							
							
							LastFailed now creates .cache only when needed. Fixes  #1342  
							
						 
						
							2016-03-11 11:18:50 +01:00  
				
					
						
							
							
								 
						
							
								52a5acda92 
								
							 
						 
						
							
							
								
								Use testscollected to make xdist happy  
							
							
							
						 
						
							2016-03-11 14:48:17 +06:00  
				
					
						
							
							
								 
						
							
								3ea987ef9d 
								
							 
						 
						
							
							
								
								Copy over name and path attributes to the re-raised exception  
							
							
							
						 
						
							2016-03-10 18:13:59 -03:00  
				
					
						
							
							
								 
						
							
								9577120592 
								
							 
						 
						
							
							
								
								Allow custom fixture names for fixtures  
							
							... 
							
							
							
							When defining a fixture in the same module as where it is used, the
function argument shadows the fixture name, which a) annoys pylint and
b) can lead to bugs where you forget to request a fixture into a test
method.
This allows one to define fixtures with a different name than the name
of the function, bypassing that problem. 
							
						 
						
							2016-03-09 14:58:54 -08:00  
				
					
						
							
							
								 
						
							
								7a186df271 
								
							 
						 
						
							
							
								
								Improve error message when a plugin fails to import  
							
							
							
						 
						
							2016-03-08 19:18:13 -03:00  
				
					
						
							
							
								 
						
							
								7d155bd3cf 
								
							 
						 
						
							
							
								
								Fix sys.version_info errors.  
							
							
							
						 
						
							2016-03-08 10:12:31 -08:00  
				
					
						
							
							
								 
						
							
								6a902924f8 
								
							 
						 
						
							
							
								
								Fix trailing whitespace errors.  
							
							
							
						 
						
							2016-03-07 19:56:23 -08:00  
				
					
						
							
							
								 
						
							
								c9c73b8d8e 
								
							 
						 
						
							
							
								
								Fix zero-length field name error in python2.6  
							
							
							
						 
						
							2016-03-07 19:54:43 -08:00  
				
					
						
							
							
								 
						
							
								5dab0954a0 
								
							 
						 
						
							
							
								
								Add approx() to the Sphinx docs.  
							
							
							
						 
						
							2016-03-07 18:14:49 -08:00  
				
					
						
							
							
								 
						
							
								b8a8382c2c 
								
							 
						 
						
							
							
								
								Reduce the default absolute error threshold to 1e-12.  
							
							
							
						 
						
							2016-03-07 16:43:53 -08:00  
				
					
						
							
							
								 
						
							
								bf97d5b817 
								
							 
						 
						
							
							
								
								Use the plus/minus unicode symbol in the repr string.  
							
							... 
							
							
							
							This was a challenge because it had to work in python2 and python3,
which have almost opposite unicode models, and I couldn't use the six
library.  I'm also not sure the solution I found would work in python3
before python3.3, because I use the u'' string prefix which I think was
initially not part of python3. 
							
						 
						
							2016-03-07 16:40:41 -08:00  
				
					
						
							
							
								 
						
							
								dd28e28b34 
								
							 
						 
						
							
							
								
								Make a few stylistic improvements.  
							
							
							
						 
						
							2016-03-07 10:10:54 -08:00  
				
					
						
							
							
								 
						
							
								6f5e1e386a 
								
							 
						 
						
							
							
								
								Add a convenient and correct way to compare floats.  
							
							
							
						 
						
							2016-03-07 10:10:54 -08:00  
				
					
						
							
							
								 
						
							
								6d4b14d7ee 
								
							 
						 
						
							
							
								
								Merge pull request  #1438  from Bachmann1234/issue-1437  
							
							... 
							
							
							
							Make a good faith effort to display a bytestring when one is provided… 
							
						 
						
							2016-03-06 06:48:32 +01:00  
				
					
						
							
							
								 
						
							
								fd0010e6e9 
								
							 
						 
						
							
							
								
								Merge pull request  #1439  from pytest-dev/fix-1178  
							
							... 
							
							
							
							Support pytest.fail with non-ascii characters
Fixes  #1178  
							
						 
						
							2016-03-06 06:42:35 +01:00  
				
					
						
							
							
								 
						
							
								8ce32b0795 
								
							 
						 
						
							
							
								
								When a regex pattern contains bytes instead of a string use escape_encode to turn it into a string before further processing. Thanks @nicoddemus for the review and tips!  
							
							
							
						 
						
							2016-03-05 21:04:34 -05:00  
				
					
						
							
							
								 
						
							
								5d4703852e 
								
							 
						 
						
							
							
								
								Add test when using native strings with non-ascii chars  
							
							
							
						 
						
							2016-03-05 19:34:15 -03:00  
				
					
						
							
							
								 
						
							
								d8403d793f 
								
							 
						 
						
							
							
								
								Fix decoding issue while formatting SyntaxErrors during collection  
							
							... 
							
							
							
							This happens only in Python 2, as in Python 3 we receive
the "badline" in the exception is already properly encoded
Fix  #578  
							
						 
						
							2016-03-05 16:58:50 -03:00  
				
					
						
							
							
								 
						
							
								24d3e01548 
								
							 
						 
						
							
							
								
								pytest.fail with non-ascii characters raises an internal pytest error  
							
							... 
							
							
							
							Fix  #1178  
						
							2016-03-05 16:09:01 -03:00  
				
					
						
							
							
								 
						
							
								819e0ead44 
								
							 
						 
						
							
							
								
								Mention that pytest_addoption may be used from conftest files  
							
							... 
							
							
							
							fix  #1427  
						
							2016-03-03 18:26:01 -03:00  
				
					
						
							
							
								 
						
							
								28530836c9 
								
							 
						 
						
							
							
								
								issue469: add fix junit double colon split issue  
							
							
							
						 
						
							2016-03-02 22:18:57 +00:00  
				
					
						
							
							
								 
						
							
								891e029518 
								
							 
						 
						
							
							
								
								Add a new doctest_namespace fixture  
							
							... 
							
							
							
							This fixture can be used to inject names into the namespace in which
your doctests run. 
							
						 
						
							2016-03-02 12:43:57 +00:00  
				
					
						
							
							
								 
						
							
								c8c5a416ef 
								
							 
						 
						
							
							
								
								Bump version to 2.10.0.dev1  
							
							
							
						 
						
							2016-03-01 18:48:13 -03:00  
				
					
						
							
							
								 
						
							
								81af1c024a 
								
							 
						 
						
							
							
								
								Bump version to 2.9.1.dev1  
							
							
							
						 
						
							2016-03-01 18:46:17 -03:00  
				
					
						
							
							
								 
						
							
								623e786524 
								
							 
						 
						
							
							
								
								Bump version to 2.9.0  
							
							
							
						 
						
							2016-02-29 15:39:00 -05:00  
				
					
						
							
							
								 
						
							
								7e758a9dc6 
								
							 
						 
						
							
							
								
								junit: allow multiple properties with same name  
							
							... 
							
							
							
							It might happen that test can be affected by two or more bugs.
I need to be able to track them all. 
							
						 
						
							2016-02-29 16:00:26 +01:00  
				
					
						
							
							
								 
						
							
								424b46de1b 
								
							 
						 
						
							
							
								
								Fix a typo in the docstring for mark.MarkGenerator  
							
							
							
						 
						
							2016-02-27 14:15:42 +01:00  
				
					
						
							
							
								 
						
							
								c9927bb66f 
								
							 
						 
						
							
							
								
								Merge pull request  #1414  from rygwdn/indexerror  
							
							... 
							
							
							
							catch IndexError exceptions when getting exception source location 
							
						 
						
							2016-02-26 18:53:10 +01:00  
				
					
						
							
							
								 
						
							
								cf9a09e988 
								
							 
						 
						
							
							
								
								catch IndexError exceptions when getting exception source location  
							
							
							
						 
						
							2016-02-26 08:18:12 -04:00  
				
					
						
							
							
								 
						
							
								5f90907509 
								
							 
						 
						
							
							
								
								Fix skip/xfail markers in parametrized arguments  
							
							... 
							
							
							
							Fix  #1412  
						
							2016-02-25 19:13:09 -03:00  
				
					
						
							
							
								 
						
							
								96a331e32f 
								
							 
						 
						
							
							
								
								Display collect progress only when in a terminal  
							
							... 
							
							
							
							Fix  #1397  
						
							2016-02-20 14:38:30 -02:00  
				
					
						
							
							
								 
						
							
								e4d361b093 
								
							 
						 
						
							
							
								
								LastFailed now creates .cache only when needed.  Fixes   #1342  
							
							
							
						 
						
							2016-02-16 11:42:04 +06:00  
				
					
						
							
							
								 
						
							
								0eeb466f11 
								
							 
						 
						
							
							
								
								Fix strict xfail: it should behave exactly like xfail when a test fails  
							
							
							
						 
						
							2016-02-15 19:18:48 -02:00  
				
					
						
							
							
								 
						
							
								ee88679c54 
								
							 
						 
						
							
							
								
								Fix bug in strict xfail: test was not being actually called  
							
							
							
						 
						
							2016-02-15 18:43:45 -02:00  
				
					
						
							
							
								 
						
							
								7823838e69 
								
							 
						 
						
							
							
								
								Add strict option to xfail, making tests which XPASS to actually fail the suite  
							
							... 
							
							
							
							Fix  #1355  
						
							2016-02-14 20:52:27 -02:00  
				
					
						
							
							
								 
						
							
								a965386b9e 
								
							 
						 
						
							
							
								
								Add bool type to addini  
							
							
							
						 
						
							2016-02-14 20:52:27 -02:00  
				
					
						
							
							
								 
						
							
								1b431d6644 
								
							 
						 
						
							
							
								
								fix formatting utf-8 error explanation  
							
							
							
						 
						
							2016-02-12 20:28:06 +01:00  
				
					
						
							
							
								 
						
							
								bfa2fadac1 
								
							 
						 
						
							
							
								
								fix issue  #1366  by showing a note on the --fulltrace option  
							
							
							
						 
						
							2016-02-10 20:27:50 +01:00  
				
					
						
							
							
								 
						
							
								51694b8295 
								
							 
						 
						
							
							
								
								Merge branch 'master' into issue1290-at-operator  
							
							
							
						 
						
							2016-02-06 09:31:42 -02:00  
				
					
						
							
							
								 
						
							
								7d107018e8 
								
							 
						 
						
							
							
								
								Fix   #1290 : Py3.5's @ operator/assertion rewriting.  
							
							
							
						 
						
							2016-02-05 23:09:57 +00:00  
				
					
						
							
							
								 
						
							
								de1a9f574c 
								
							 
						 
						
							
							
								
								merge from master  
							
							
							
						 
						
							2016-02-05 00:10:28 +01:00  
				
					
						
							
							
								 
						
							
								79722ae89b 
								
							 
						 
						
							
							
								
								Add expected exceptions to 'DID NOT RAISE' msg  
							
							
							
						 
						
							2016-02-03 14:12:41 +03:00  
				
					
						
							
							
								 
						
							
								e35ce98f89 
								
							 
						 
						
							
							
								
								Add explicit flag names for failed first and last failed  
							
							
							
						 
						
							2016-01-27 21:28:38 +00:00  
				
					
						
							
							
								 
						
							
								e43eaffd93 
								
							 
						 
						
							
							
								
								Remove unused import  
							
							
							
						 
						
							2016-01-25 23:30:53 -02:00  
				
					
						
							
							
								 
						
							
								7a6f902f6f 
								
							 
						 
						
							
							
								
								Drop assertionnew and assertionold from _pytest._code  
							
							
							
						 
						
							2016-01-25 23:18:04 -02:00  
				
					
						
							
							
								 
						
							
								a912d3745b 
								
							 
						 
						
							
							
								
								Moved py.code code over to py.test  
							
							... 
							
							
							
							Fix  #103  
						
							2016-01-25 23:18:04 -02:00  
				
					
						
							
							
								 
						
							
								6c3e6401d4 
								
							 
						 
						
							
							
								
								begin 2.8.8 cycle  
							
							
							
						 
						
							2016-01-24 23:56:56 +01:00  
				
					
						
							
							
								 
						
							
								64d7d00218 
								
							 
						 
						
							
							
								
								Prepare 2.8.7 release  
							
							
							
						 
						
							2016-01-24 17:59:48 +01:00  
				
					
						
							
							
								 
						
							
								2d05f831fe 
								
							 
						 
						
							
							
								
								monkeypatch: unnest handling code  
							
							... 
							
							
							
							this avoid python3 nested exceptions 
							
						 
						
							2016-01-24 12:28:14 +01:00  
				
					
						
							
							
								 
						
							
								cd9e30b221 
								
							 
						 
						
							
							
								
								work around python 2/3 difference by using str(exception)  
							
							
							
						 
						
							2016-01-24 00:40:27 +01:00  
				
					
						
							
							
								 
						
							
								d028fe1e66 
								
							 
						 
						
							
							
								
								remove unused import  
							
							
							
						 
						
							2016-01-23 20:29:54 +01:00  
				
					
						
							
							
								 
						
							
								b825af2e66 
								
							 
						 
						
							
							
								
								pass trough annotated exceptions  
							
							
							
						 
						
							2016-01-23 19:31:17 +01:00  
				
					
						
							
							
								 
						
							
								60e9698530 
								
							 
						 
						
							
							
								
								fix issue 1338  
							
							
							
						 
						
							2016-01-23 19:12:51 +01:00  
				
					
						
							
							
								 
						
							
								9e6bb74d71 
								
							 
						 
						
							
							
								
								reformat monkeypatch core plugin/its tests  
							
							
							
						 
						
							2016-01-23 19:12:51 +01:00  
				
					
						
							
							
								 
						
							
								199fcf93d4 
								
							 
						 
						
							
							
								
								Merge branch 'master' into 'features'  
							
							
							
						 
						
							2016-01-22 18:32:45 -02:00  
				
					
						
							
							
								 
						
							
								b7de0401b8 
								
							 
						 
						
							
							
								
								Bump version to 2.8.7.dev1  
							
							
							
						 
						
							2016-01-22 17:59:25 -02:00  
				
					
						
							
							
								 
						
							
								82d00efa8d 
								
							 
						 
						
							
							
								
								2.8.6 release: version, CHANGELOG  
							
							... 
							
							
							
							Remove note about expected failing envs in tox, as tox now supports
skipping certain environments based on the platform. 
							
						 
						
							2016-01-21 19:17:53 -02:00  
				
					
						
							
							
								 
						
							
								b28b3cc271 
								
							 
						 
						
							
							
								
								Add captured stdout to jUnit report on setup error  
							
							
							
						 
						
							2016-01-20 20:13:01 +03:00  
				
					
						
							
							
								 
						
							
								7b13c4bec0 
								
							 
						 
						
							
							
								
								Fix flakes  
							
							
							
						 
						
							2016-01-14 21:01:57 -02:00  
				
					
						
							
							
								 
						
							
								bc32e45bb6 
								
							 
						 
						
							
							
								
								Merge pull request  #1314  from The-Compiler/ci-verbose  
							
							... 
							
							
							
							Always show full comparison output if on CI. 
							
						 
						
							2016-01-11 10:05:15 +01:00  
				
					
						
							
							
								 
						
							
								3e5c9038ec 
								
							 
						 
						
							
							
								
								Always show full comparison output if on CI.  
							
							... 
							
							
							
							When you don't get enough information with a test running on a CI, it's quite
frustrating, for various reasons:
- It's more likely to be a flaky test, so you might not be able to reproduce
  the failure.
- Passing -vv is quite bothersome (creating a temporary commit and reverting
  it)
For those reasons, if something goes wrong on CI, it's good to have as much
information as possible. 
							
						 
						
							2016-01-11 08:45:04 +01:00  
				
					
						
							
							
								 
						
							
								b2c0864fbf 
								
							 
						 
						
							
							
								
								Merge pull request  #1318  from nicoddemus/doctest-unicode-error  
							
							... 
							
							
							
							Fix decode error in Python 2.7 when docstrings contain a non-ascii character 
							
						 
						
							2016-01-11 08:37:24 +01:00  
				
					
						
							
							
								 
						
							
								f46de68804 
								
							 
						 
						
							
							
								
								Fixes bug with stdout/stderr capture on pdb  
							
							
							
						 
						
							2016-01-09 12:04:26 +00:00  
				
					
						
							
							
								 
						
							
								3c19cfcd9a 
								
							 
						 
						
							
							
								
								Fix decode error in Python 2.7 when docstrings contain a non-ascii character  
							
							... 
							
							
							
							Fix  #628  
						
							2016-01-08 23:10:02 -02:00  
				
					
						
							
							
								 
						
							
								b8784c28c9 
								
							 
						 
						
							
							
								
								Merge branch 'master' into 'features'  
							
							
							
						 
						
							2016-01-08 21:51:34 -02:00  
				
					
						
							
							
								 
						
							
								369d9ecaa5 
								
							 
						 
						
							
							
								
								pytest warnings emitted during ``pytest_terminal_summary`` are now properly displayed.  
							
							... 
							
							
							
							Fix  #1305  
						
							2016-01-04 00:07:45 -02:00  
				
					
						
							
							
								 
						
							
								6c170201d6 
								
							 
						 
						
							
							
								
								Merge branch 'master' into features  
							
							
							
						 
						
							2016-01-02 23:56:01 +01:00  
				
					
						
							
							
								 
						
							
								bf4de4bd68 
								
							 
						 
						
							
							
								
								Merge pull request  #1294  from nicoddemus/doctest-bytes-literals  
							
							... 
							
							
							
							Doctest bytes literals 
							
						 
						
							2016-01-01 18:18:08 +01:00  
				
					
						
							
							
								 
						
							
								1bdf71730a 
								
							 
						 
						
							
							
								
								Complement  #1255  by adding tests and docs  
							
							... 
							
							
							
							Fix  #1242  
						
							2015-12-30 18:24:59 -02:00  
				
					
						
							
							
								 
						
							
								0ea8dc0d40 
								
							 
						 
						
							
							
								
								make --doctest-glob multi-allowed  
							
							
							
						 
						
							2015-12-30 17:32:14 -02:00  
				
					
						
							
							
								 
						
							
								638b3f5e39 
								
							 
						 
						
							
							
								
								Make monkeypatch calls O(1)  
							
							... 
							
							
							
							Fix  #1292  
						
							2015-12-29 22:04:35 -02:00  
				
					
						
							
							
								 
						
							
								a0edbb75a4 
								
							 
						 
						
							
							
								
								Implement ALLOW_BYTES doctest option  
							
							... 
							
							
							
							Fix  #1287  
						
							2015-12-29 20:55:19 -02:00  
				
					
						
							
							
								 
						
							
								8d49abb0d1 
								
							 
						 
						
							
							
								
								Make monkeypatch differentiate ImportError sources  
							
							... 
							
							
							
							Previously `monkeypatch` assumed that any `ImportError` was caused by
a mistake in the specified import path. However this assumption is false 
in case the import target itself causes an `ImportError`.
Fixes : #900  
							
						 
						
							2015-12-27 22:44:23 +01:00  
				
					
						
							
							
								 
						
							
								5afb61ad26 
								
							 
						 
						
							
							
								
								Fix trailing white-space  
							
							
							
						 
						
							2015-12-25 17:51:55 -02:00  
				
					
						
							
							
								 
						
							
								57bc14caa0 
								
							 
						 
						
							
							
								
								Apply readline workaround during initial conftest loading  
							
							
							
						 
						
							2015-12-25 17:46:19 -02:00  
				
					
						
							
							
								 
						
							
								6e170a4a1c 
								
							 
						 
						
							
							
								
								* Moved workaround to its own function, mostly for the sake of adding  
							
							... 
							
							
							
							a more descriptive docstring (the workaround itself is just to import
  readline earlier).  I removed the conditional on targetfd from the
  workaround since it doesn't really matter.
* Added # noqa marker.
* Added changelog entry, and self to authors. 
							
						 
						
							2015-12-24 16:43:34 -05:00  
				
					
						
							
							
								 
						
							
								924a9667e1 
								
							 
						 
						
							
							
								
								Make sure readline has been imported before duping any stdio handles--otherwise pyreadline fails to connect to the correct handle for the console's stdout/in.  
							
							
							
						 
						
							2015-12-24 14:56:57 -05:00  
				
					
						
							
							
								 
						
							
								943099ddd1 
								
							 
						 
						
							
							
								
								Merge newinterpret into reinterpret.py  
							
							
							
						 
						
							2015-12-16 18:31:43 -02:00  
				
					
						
							
							
								 
						
							
								81588d7f63 
								
							 
						 
						
							
							
								
								Remove obsolete "oldinterpret" module  
							
							
							
						 
						
							2015-12-16 16:16:22 -02:00  
				
					
						
							
							
								 
						
							
								af893aab26 
								
							 
						 
						
							
							
								
								Remove code related to support python <= 2.5  
							
							... 
							
							
							
							Fix  #1226  
						
							2015-12-16 16:16:22 -02:00  
				
					
						
							
							
								 
						
							
								8bf7e7cc4b 
								
							 
						 
						
							
							
								
								fixes   #1259  - take finalized nodes out of the mapping  
							
							... 
							
							
							
							this allows double node id usage for file based items 
							
						 
						
							2015-12-16 19:09:44 +01:00  
				
					
						
							
							
								 
						
							
								2b2bec6b97 
								
							 
						 
						
							
							
								
								Remove experimental status from pytest_exception_interact  
							
							
							
						 
						
							2015-12-16 14:29:39 -02:00  
				
					
						
							
							
								 
						
							
								6ac31088c5 
								
							 
						 
						
							
							
								
								Merge branch 'master' into merge-master-into-features  
							
							
							
						 
						
							2015-12-11 23:13:50 -02:00  
				
					
						
							
							
								 
						
							
								e87facfb22 
								
							 
						 
						
							
							
								
								Bump master to 2.8.6.dev1  
							
							
							
						 
						
							2015-12-11 23:07:30 -02:00  
				
					
						
							
							
								 
						
							
								a124163425 
								
							 
						 
						
							
							
								
								Prepare for 2.8.5: bump version, CHANGELOG, announce  
							
							
							
						 
						
							2015-12-11 19:20:07 -02:00  
				
					
						
							
							
								 
						
							
								86b6ce5042 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into merge-master-into-features  
							
							
							
						 
						
							2015-12-10 19:41:14 -02:00  
				
					
						
							
							
								 
						
							
								8b61a332ba 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'bukzor/features-merge-master' into features  
							
							
							
						 
						
							2015-12-10 19:03:55 -02:00  
				
					
						
							
							
								 
						
							
								ec02f694ef 
								
							 
						 
						
							
							
								
								Update python.py  
							
							... 
							
							
							
							updated dictionary itteration to create a list for generation, so that tests can be added in the generator functions under python3. This works fine as-is in python2 because python 2 already creates a list, whereas python3 returns an itterator. Forcing a list format for the return fixes python3 to work the same way as python2 
							
						 
						
							2015-12-09 11:32:19 -08:00  
				
					
						
							
							
								 
						
							
								1c46462991 
								
							 
						 
						
							
							
								
								Fix deprecated_call regression introduced in 2.8.4  
							
							... 
							
							
							
							Fix  #1238  
						
							2015-12-08 22:40:05 -02:00  
				
					
						
							
							
								 
						
							
								eabf2f9091 
								
							 
						 
						
							
							
								
								Merge branch 'master' into features  
							
							... 
							
							
							
							Conflicts:
	AUTHORS
	_pytest/__init__.py
	_pytest/hookspec.py
	_pytest/recwarn.py
	testing/test_recwarn.py 
							
						 
						
							2015-12-07 14:28:59 -08:00  
				
					
						
							
							
								 
						
							
								fbac936596 
								
							 
						 
						
							
							
								
								Add -rp and -rP options to report passing tests.  
							
							... 
							
							
							
							-rP is an alternative to `-s` for viewing the output of passing tests.
This causes the captured stdout/stderr of passing tests to be output in
the same way as that of failing tests.
-rp adds a simple one-line-per-test summary for passing tests.
Neither option is included by -ra.
Additional changes to `pytest_capturelog` and `pytest_catchlog` are
needed for this option to also output captured logs: They must be
changed to use `rep.sections.add` instead of `rep.longrepr.addsection`,
and to add these additional sections even if the test passes, since
passing tests don't seem to have a `longrepr` at report time. 
							
						 
						
							2015-12-07 11:32:56 -10:00  
				
					
						
							
							
								 
						
							
								7b7737bf96 
								
							 
						 
						
							
							
								
								handle duplicate test ids via collection and xdist each reporting  
							
							
							
						 
						
							2015-12-07 21:54:25 +01:00  
				
					
						
							
							
								 
						
							
								9ea7826427 
								
							 
						 
						
							
							
								
								Junitxml: correct node reporter attribute names  
							
							
							
						 
						
							2015-12-07 21:54:25 +01:00  
				
					
						
							
							
								 
						
							
								09cc45b0c5 
								
							 
						 
						
							
							
								
								junitxml: correct docstring of make_properties_node  
							
							
							
						 
						
							2015-12-07 21:54:25 +01:00  
				
					
						
							
							
								 
						
							
								0aa54101c9 
								
							 
						 
						
							
							
								
								junitxml: follow Bruno's attribute/method naming hint from the review  
							
							
							
						 
						
							2015-12-07 21:54:25 +01:00  
				
					
						
							
							
								 
						
							
								518c88f149 
								
							 
						 
						
							
							
								
								finalize nodereporters by throwing away the intermediate xml nodes, fixes issue  #1074  
							
							
							
						 
						
							2015-12-07 21:54:25 +01:00  
				
					
						
							
							
								 
						
							
								5f5a7995b9 
								
							 
						 
						
							
							
								
								reintroduce junitxml report order and debug cleanups  
							
							
							
						 
						
							2015-12-07 21:54:24 +01:00  
				
					
						
							
							
								 
						
							
								0528e5b45f 
								
							 
						 
						
							
							
								
								junitxml: intermediate, move testcase generation to NodeReporter  
							
							
							
						 
						
							2015-12-07 21:54:24 +01:00  
				
					
						
							
							
								 
						
							
								9b04958303 
								
							 
						 
						
							
							
								
								junitxml: keep track of custom property insert order  
							
							... 
							
							
							
							+ review: should we allow the same key multile times 
							
						 
						
							2015-12-07 21:54:24 +01:00  
				
					
						
							
							
								 
						
							
								faed54d6c7 
								
							 
						 
						
							
							
								
								junitxml: use node.warn to ensure fslocations  
							
							
							
						 
						
							2015-12-07 21:54:24 +01:00  
				
					
						
							
							
								 
						
							
								1f609f96e6 
								
							 
						 
						
							
							
								
								junitxml: introduce nodereporter and track durations/properties there  
							
							
							
						 
						
							2015-12-07 21:54:24 +01:00  
				
					
						
							
							
								 
						
							
								0664ae137c 
								
							 
						 
						
							
							
								
								junitxml: remove debug print  
							
							
							
						 
						
							2015-12-07 21:54:24 +01:00  
				
					
						
							
							
								 
						
							
								d0107c898e 
								
							 
						 
						
							
							
								
								junitxml restrucutre stat generation - use node tags  
							
							
							
						 
						
							2015-12-07 21:54:24 +01:00  
				
					
						
							
							
								 
						
							
								2a31df072b 
								
							 
						 
						
							
							
								
								junitxml: reverse the if/else logic for failure appending  
							
							
							
						 
						
							2015-12-07 21:54:24 +01:00  
				
					
						
							
							
								 
						
							
								02f5defd89 
								
							 
						 
						
							
							
								
								yapf junitxml  
							
							
							
						 
						
							2015-12-07 21:54:24 +01:00  
				
					
						
							
							
								 
						
							
								c727860241 
								
							 
						 
						
							
							
								
								bump to 2.8.5.dev  
							
							
							
						 
						
							2015-12-06 20:31:14 +01:00  
				
					
						
							
							
								 
						
							
								a3353c49fd 
								
							 
						 
						
							
							
								
								prepare release 2.8.4 - changelog updates + version bump  
							
							
							
						 
						
							2015-12-06 16:13:55 +01:00  
				
					
						
							
							
								 
						
							
								14bc3c4009 
								
							 
						 
						
							
							
								
								Fix pastebin when captured output contains non-ascii characters  
							
							... 
							
							
							
							Fix  #1219  
						
							2015-12-03 20:07:18 -02:00  
				
					
						
							
							
								 
						
							
								a54e4e64cd 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into pastebin-py3  
							
							
							
						 
						
							2015-12-01 23:51:14 -02:00  
				
					
						
							
							
								 
						
							
								6a2ebddc7c 
								
							 
						 
						
							
							
								
								Decode urlopen response in pastebin  
							
							... 
							
							
							
							Fix  #1198  
						
							2015-12-01 23:33:37 -02:00  
				
					
						
							
							
								 
						
							
								6be6798cdf 
								
							 
						 
						
							
							
								
								Fix spelling: explicitely --> explicitly  
							
							
							
						 
						
							2015-12-01 01:41:47 -08:00  
				
					
						
							
							
								 
						
							
								0d2668017d 
								
							 
						 
						
							
							
								
								Fix spelling mistake in  #1207 .  
							
							
							
						 
						
							2015-11-30 17:33:34 +01:00  
				
					
						
							
							
								 
						
							
								aba55a0fb2 
								
							 
						 
						
							
							
								
								Fix terminal output if no tests were run.  
							
							... 
							
							
							
							Before:
====  in 0.00 seconds ====
After:
==== no tests run in 0.00 seconds ==== 
							
						 
						
							2015-11-30 17:24:40 +01:00  
				
					
						
							
							
								 
						
							
								b5d65e5139 
								
							 
						 
						
							
							
								
								Merge pull request  #1206  from The-Compiler/collect-getattr  
							
							... 
							
							
							
							Don't collect classes with truthy __getattr__. 
							
						 
						
							2015-11-30 17:23:47 +01:00  
				
					
						
							
							
								 
						
							
								ba9146c131 
								
							 
						 
						
							
							
								
								Don't collect classes with truthy __getattr__.  
							
							... 
							
							
							
							When we have a metaclass which returns something truthy (like a method) in its
__getattr__, we collected the class because pytest thought its __test__
attribute was set to True.
We can work around this to some degree by assuming __test__ will always be set
to an explicit True if that's what the user has intended, and if it's something
other than that, this is probably a mistake.
Fixes  #1204 . 
							
						 
						
							2015-11-30 16:41:13 +01:00  
				
					
						
							
							
								 
						
							
								c790f7475e 
								
							 
						 
						
							
							
								
								Fix getting line number with nasty __getattr__.  
							
							... 
							
							
							
							When an object has a custom __getattr__ which always returns a non-int, we
tried to get compat_co_firstlineno from it and checked it was a integer, which
caused an exception if such a class is mistakenly collected.
If we still mistakenly collect such a class (which is likely to be something
other than a test), we now skip it with a warning (because it probably has an
__init__) instead of producing an error.
See #1204 . 
							
						 
						
							2015-11-30 16:13:15 +01:00  
				
					
						
							
							
								 
						
							
								81ad1689b9 
								
							 
						 
						
							
							
								
								fix   #1198  - removed docoding the result  
							
							
							
						 
						
							2015-11-29 19:20:37 +03:30  
				
					
						
							
							
								 
						
							
								44f60ba141 
								
							 
						 
						
							
							
								
								fixed   #1198  issue by encoding the unicode parameters to bytes and decoding the  
							
							... 
							
							
							
							bytes response to unicode 
							
						 
						
							2015-11-29 18:27:05 +03:30  
				
					
						
							
							
								 
						
							
								603d81ef2f 
								
							 
						 
						
							
							
								
								deprecated_call now uses monkey patching strategy to capture warnings  
							
							... 
							
							
							
							similar to what we had in 2.7, with a few enhancements
Fix  #1190  
							
						 
						
							2015-11-26 16:48:58 -02:00  
				
					
						
							
							
								 
						
							
								6378cdf7a9 
								
							 
						 
						
							
							
								
								Restored 2.7 implentation of deprecated_call  
							
							
							
						 
						
							2015-11-26 15:54:57 -02:00  
				
					
						
							
							
								 
						
							
								b20803f0a6 
								
							 
						 
						
							
							
								
								Mention pytest_enter_pdb in the docs  
							
							
							
						 
						
							2015-11-23 18:00:02 -02:00  
				
					
						
							
							
								 
						
							
								df767cca8f 
								
							 
						 
						
							
							
								
								Merge pull request  #1188  from nicoddemus/pytest_enter_pdb  
							
							... 
							
							
							
							Pass pytest config object to pytest_enter_pdb 
							
						 
						
							2015-11-23 20:55:33 +01: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  
				
					
						
							
							
								 
						
							
								af46ffe021 
								
							 
						 
						
							
							
								
								bump to 2.8.4.dev  
							
							
							
						 
						
							2015-11-19 22:01:34 +01:00  
				
					
						
							
							
								 
						
							
								3dc57d99f2 
								
							 
						 
						
							
							
								
								Changelog groming and release preps for 2.8.3  
							
							
							
						 
						
							2015-11-18 17:34:30 +01:00  
				
					
						
							
							
								 
						
							
								7d6edb9ca5 
								
							 
						 
						
							
							
								
								Fix unittest.skip decorator test and separate the fix into a different, self-doc function  
							
							
							
						 
						
							2015-11-04 19:54:18 -02:00  
				
					
						
							
							
								 
						
							
								313050b15b 
								
							 
						 
						
							
							
								
								Suggested edits by Bruno.  
							
							... 
							
							
							
							Moved fix to TestCaseFunction.setup. Added myself to AUTHORS and added entry to CHANGELOG 
							
						 
						
							2015-11-04 15:30:16 -05:00  
				
					
						
							
							
								 
						
							
								8de2c035e2 
								
							 
						 
						
							
							
								
								Fixes   #1169  
							
							... 
							
							
							
							The unittest.skip decorator runs @functools.wraps on self._testcase. functools.wraps expects a "__name__" attribute and this patch adds one. It might not be the correct fix, but it works for me. 
							
						 
						
							2015-11-04 13:52:40 -05:00  
				
					
						
							
							
								 
						
							
								9013cb1b4c 
								
							 
						 
						
							
							
								
								Merge pull request  #1144  from The-Compiler/elcapitan-sip  
							
							... 
							
							
							
							Handle EPERM when writing rewritten bytecode. 
							
						 
						
							2015-11-01 08:20:00 +01:00  
				
					
						
							
							
								 
						
							
								f3f61fb5d1 
								
							 
						 
						
							
							
								
								Color highlight on the name of the failed tests  
							
							
							
						 
						
							2015-10-28 08:12:57 +00:00  
				
					
						
							
							
								 
						
							
								9a04879129 
								
							 
						 
						
							
							
								
								Remove commented out extrainit  
							
							... 
							
							
							
							Unused since 2012, and the docstring syntax is incorrect with
four quotes. 
							
						 
						
							2015-10-20 21:08:21 +11:00  
				
					
						
							
							
								 
						
							
								2956627b8b 
								
							 
						 
						
							
							
								
								Handle EPERM when writing rewritten bytecode.  
							
							... 
							
							
							
							Fixes  #1143 . 
						
							2015-10-17 11:55:55 +02:00  
				
					
						
							
							
								 
						
							
								311b0a9683 
								
							 
						 
						
							
							
								
								Fix situation where a traceback entry "path" returns a str object  
							
							... 
							
							
							
							Fix  #1133  
						
							2015-10-16 20:18:14 -03:00  
				
					
						
							
							
								 
						
							
								a3bda59a30 
								
							 
						 
						
							
							
								
								collection: Prevent non-function callables from being collected  
							
							... 
							
							
							
							Fixes issue 331
previously to this change the collection code would issue a warning for
when ever it encountered a variable that looked like a test but wasn't a
function saying that it wouldn't collect it because it wasn't a function.
This fixes the logic so that if that warning is issued it really isn't
collected.
However previously special cases existed to support tests that were
created using functools.wraps and functools.partial. So the condition for
issuing that warning has been updated to take that in to account
Also try the old way of detecting functions just for proper integration
with mock.path in python 2.7 the get_real_func returned the unbound method 
							
						 
						
							2015-10-12 22:23:18 +01:00  
				
					
						
							
							
								 
						
							
								db077555f6 
								
							 
						 
						
							
							
								
								Merge pull request  #1102  from nicoddemus/doctest-fixtures-fix  
							
							... 
							
							
							
							Fix autouse fixtures and doctest modules 
							
						 
						
							2015-10-10 14:21:53 +02:00  
				
					
						
							
							
								 
						
							
								88c8dd96f9 
								
							 
						 
						
							
							
								
								issue1035 Override inspect.isclass for python 2.6  
							
							
							
						 
						
							2015-10-09 19:44:47 +01: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  
				
					
						
							
							
								 
						
							
								b5b53b6aec 
								
							 
						 
						
							
							
								
								start 2.8.3 development  
							
							
							
						 
						
							2015-10-07 17:56:05 +02:00  
				
					
						
							
							
								 
						
							
								7c529e0afe 
								
							 
						 
						
							
							
								
								Merge branch '2.8.2-release'  
							
							
							
						 
						
							2015-10-07 17:51:34 +02:00  
				
					
						
							
							
								 
						
							
								42937d4bb6 
								
							 
						 
						
							
							
								
								Prepare 2.8.2 release.  
							
							
							
						 
						
							2015-10-06 21:06:25 +02:00  
				
					
						
							
							
								 
						
							
								493530ec6d 
								
							 
						 
						
							
							
								
								typo fix, changed position of context manager notes  
							
							
							
						 
						
							2015-10-05 12:13:25 -07:00  
				
					
						
							
							
								 
						
							
								a14c77aeba 
								
							 
						 
						
							
							
								
								Fix problems when mixing autouse fixtures and doctest modules  
							
							... 
							
							
							
							The main problem was that previously DoctestModule was setting
up its fixtures during collection, instead of letting
each DoctestItem make its own fixture setup
Fix  #1100 
Fix  #1057  
							
						 
						
							2015-10-03 16:07:14 -03:00  
				
					
						
							
							
								 
						
							
								df874db817 
								
							 
						 
						
							
							
								
								Update default reason to "unconditional skip"  
							
							
							
						 
						
							2015-10-03 17:02:18 +01:00  
				
					
						
							
							
								 
						
							
								25d74a5919 
								
							 
						 
						
							
							
								
								Dont explicitly inherit from object  
							
							
							
						 
						
							2015-10-03 16:55:04 +01:00  
				
					
						
							
							
								 
						
							
								213dbe7a5f 
								
							 
						 
						
							
							
								
								newlines  
							
							
							
						 
						
							2015-10-03 16:42:15 +01:00  
				
					
						
							
							
								 
						
							
								9e57954b03 
								
							 
						 
						
							
							
								
								First argument in pytest.mark.skip is a reason  
							
							
							
						 
						
							2015-10-03 16:42:15 +01:00  
				
					
						
							
							
								 
						
							
								eee24138b0 
								
							 
						 
						
							
							
								
								Fix failing test  
							
							
							
						 
						
							2015-10-03 16:42:15 +01:00  
				
					
						
							
							
								 
						
							
								04545f8a54 
								
							 
						 
						
							
							
								
								classes inherit from object  
							
							
							
						 
						
							2015-10-03 16:42:15 +01:00  
				
					
						
							
							
								 
						
							
								ad0b8e31b8 
								
							 
						 
						
							
							
								
								Fix case where skip is assigned to as an attribute directly  
							
							
							
						 
						
							2015-10-03 16:42:14 +01:00  
				
					
						
							
							
								 
						
							
								b71add27da 
								
							 
						 
						
							
							
								
								Add MarkEvaluator for skip  
							
							
							
						 
						
							2015-10-03 16:42:14 +01:00  
				
					
						
							
							
								 
						
							
								5171d167ce 
								
							 
						 
						
							
							
								
								Move "note" to the end of the main text  
							
							... 
							
							
							
							Fix  #1097  
						
							2015-10-02 18:14:17 -03:00  
				
					
						
							
							
								 
						
							
								2981bece55 
								
							 
						 
						
							
							
								
								pyflakes fix  
							
							
							
						 
						
							2015-10-02 13:03:43 -07:00  
				
					
						
							
							
								 
						
							
								fd211bf490 
								
							 
						 
						
							
							
								
								Add a note about usage of the context manager  
							
							... 
							
							
							
							Addesses #1097  
							
						 
						
							2015-10-02 12:40:58 -07:00  
				
					
						
							
							
								 
						
							
								88209c6ac6 
								
							 
						 
						
							
							
								
								Merge pull request  #1092  from nicoddemus/param-ids-fix  
							
							... 
							
							
							
							Param ids fix 
							
						 
						
							2015-10-01 15:09:11 +02:00  
				
					
						
							
							
								 
						
							
								688f955f5e 
								
							 
						 
						
							
							
								
								Merge pull request  #1058  from nicoddemus/doc-how-disable-cache  
							
							... 
							
							
							
							Add docs on how to disable cache provider 
							
						 
						
							2015-10-01 13:06:02 +02:00  
				
					
						
							
							
								 
						
							
								f3cee8f0b5 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into param-ids-fix  
							
							
							
						 
						
							2015-10-01 07:58:55 -03:00  
				
					
						
							
							
								 
						
							
								b7fd3f0031 
								
							 
						 
						
							
							
								
								Merge pull request  #1093  from nicoddemus/relto-bug  
							
							... 
							
							
							
							Fix internal error when filtering tracebacks where one entry was generated by an exec() statement
Fixes  #995  
							
						 
						
							2015-10-01 06:00:40 +02:00  
				
					
						
							
							
								 
						
							
								d1e00f6e19 
								
							 
						 
						
							
							
								
								Detect dynamic code explicitly in filter_traceback  
							
							
							
						 
						
							2015-09-30 17:32:49 -03:00  
				
					
						
							
							
								 
						
							
								c9480c5b8b 
								
							 
						 
						
							
							
								
								Move imports outside _escape_bytes as suggested in review  
							
							
							
						 
						
							2015-09-30 17:02:19 -03:00  
				
					
						
							
							
								 
						
							
								a808e09204 
								
							 
						 
						
							
							
								
								fix docstring for cache fixture regarding ``/`` on keys  
							
							
							
						 
						
							2015-09-30 00:27:52 -03:00  
				
					
						
							
							
								 
						
							
								11f100813e 
								
							 
						 
						
							
							
								
								Fix internal error when filtering tracebacks where one entry was generated by an exec() statement  
							
							... 
							
							
							
							Fix  #995  
						
							2015-09-29 22:29:43 -03:00  
				
					
						
							
							
								 
						
							
								b64470443f 
								
							 
						 
						
							
							
								
								Fix SystemError when using unicode_escape on Python 3  
							
							... 
							
							
							
							Fix  #1087  
						
							2015-09-29 18:20:30 -03:00  
				
					
						
							
							
								 
						
							
								8633c4cefd 
								
							 
						 
						
							
							
								
								Fix encoding errors for parametrized tests with unicode parameters in py2  
							
							... 
							
							
							
							Fix  #1085  
						
							2015-09-29 17:57:49 -03:00  
				
					
						
							
							
								 
						
							
								cb58eaa611 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into features  
							
							... 
							
							
							
							Conflicts:
	_pytest/__init__.py
	testing/test_recwarn.py 
							
						 
						
							2015-09-29 15:56:41 +02:00  
				
					
						
							
							
								 
						
							
								c5fd42b699 
								
							 
						 
						
							
							
								
								start 2.8.2 development  
							
							
							
						 
						
							2015-09-29 15:32:33 +02:00  
				
					
						
							
							
								 
						
							
								95245b935c 
								
							 
						 
						
							
							
								
								- fix a flaky test on py35-xdist by calling  
							
							... 
							
							
							
							importlib.invalidate_caches()
- bump version to 2.8.1
- regen docs
- amend changelog, authors 
							
						 
						
							2015-09-29 13:10:59 +02:00  
				
					
						
							
							
								 
						
							
								f61f39efdd 
								
							 
						 
						
							
							
								
								Merge pull request  #1052  from The-Compiler/no-std-prefix  
							
							... 
							
							
							
							Don't hardcode 'std' for captured stdout/stderr. 
							
						 
						
							2015-09-29 09:19:40 +02:00  
				
					
						
							
							
								 
						
							
								a73d517bee 
								
							 
						 
						
							
							
								
								Merge pull request  #1080  from vodik/master  
							
							... 
							
							
							
							fix  #1034 : Add missing nodeid on pytest_logwarning call in addhook.  Thanks Simon Gomizelj for the PR. 
						
							2015-09-29 09:07:43 +02: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  
				
					
						
							
							
								 
						
							
								b184f391c6 
								
							 
						 
						
							
							
								
								Show known environment variables in py.test --help  
							
							
							
						 
						
							2015-09-28 18:34:16 -03:00  
				
					
						
							
							
								 
						
							
								5f860181b6 
								
							 
						 
						
							
							
								
								Remove print left by accident  
							
							
							
						 
						
							2015-09-28 18:25:20 -03:00  
				
					
						
							
							
								 
						
							
								e8261e0c77 
								
							 
						 
						
							
							
								
								`deprecated_call` detects pending warnings again  
							
							... 
							
							
							
							`deprecated_call` now looks for PendingDeprecationWarnings,
as it did previously but was broken by #897 . Fixes  #1037 .
Also added a test so this does not happen again. 
							
						 
						
							2015-09-28 12:11:52 -04:00  
				
					
						
							
							
								 
						
							
								971ebcbd77 
								
							 
						 
						
							
							
								
								simplify by removing the single-call "exclude_pytest_names" function  
							
							
							
						 
						
							2015-09-28 15:43:55 +02:00  
				
					
						
							
							
								 
						
							
								1c0ffc5caf 
								
							 
						 
						
							
							
								
								seems like pypy's callable builtin calls __getattr__ so we do the check  
							
							... 
							
							
							
							later. 
							
						 
						
							2015-09-28 14:02:30 +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  
				
					
						
							
							
								 
						
							
								910b25d416 
								
							 
						 
						
							
							
								
								Vendor pluggy-0.3.1  
							
							... 
							
							
							
							Fix  #704  
						
							2015-09-27 16:04:29 -03:00  
				
					
						
							
							
								 
						
							
								0c05ca1fd5 
								
							 
						 
						
							
							
								
								Merge branch 'master' into features  
							
							
							
						 
						
							2015-09-26 10:03:42 +02:00  
				
					
						
							
							
								 
						
							
								748da0e5d7 
								
							 
						 
						
							
							
								
								Fix xml generation when used with pytest-xdist  
							
							... 
							
							
							
							pytest_runtest_logreport must be careful to not depend on setup/call/teardown
being called sequentially in that order, as xdist will call them as they are reported
from the slaves
Fix  #1064  
							
						 
						
							2015-09-26 03:21:24 -03:00  
				
					
						
							
							
								 
						
							
								4867554eec 
								
							 
						 
						
							
							
								
								Merge branch 'master' into features  
							
							
							
						 
						
							2015-09-23 16:42:42 +02:00  
				
					
						
							
							
								 
						
							
								a3fdcd9b17 
								
							 
						 
						
							
							
								
								Merge pull request  #1031  from pytest-dev/unmarshable-parametrize  
							
							... 
							
							
							
							Parametrized values containing non-ascii bytes break cache 
							
						 
						
							2015-09-23 09:03:51 +02:00  
				
					
						
							
							
								 
						
							
								e5c76cb22d 
								
							 
						 
						
							
							
								
								Merge pull request  #1054  from nicoddemus/cache-fixture-docstring  
							
							... 
							
							
							
							Add docstring to cache fixture 
							
						 
						
							2015-09-23 09:00:01 +02:00  
				
					
						
							
							
								 
						
							
								79ebca3f30 
								
							 
						 
						
							
							
								
								(w)warnings -> (w)pytest-warnings in "-r chars" help  
							
							
							
						 
						
							2015-09-23 01:09:09 -03:00  
				
					
						
							
							
								 
						
							
								25d2cc4604 
								
							 
						 
						
							
							
								
								Add docstring to cache fixture  
							
							... 
							
							
							
							Fixes  #1049  
						
							2015-09-22 23:46:05 -03:00  
				
					
						
							
							
								 
						
							
								e1063678f1 
								
							 
						 
						
							
							
								
								escape bytes when creating ids for parametrized values  
							
							
							
						 
						
							2015-09-22 23:18:09 -03:00  
				
					
						
							
							
								 
						
							
								9d1ae0a149 
								
							 
						 
						
							
							
								
								Merge pull request  #1048  from RonnyPfannschmidt/pytest-1029  
							
							... 
							
							
							
							fixes  #1029  by handling access errors for cache dirs as pytest warning 
						
							2015-09-22 19:04:04 -03:00  
				
					
						
							
							
								 
						
							
								c10f483b9f 
								
							 
						 
						
							
							
								
								Don't hardcode 'std' for captured stdout/stderr.  
							
							... 
							
							
							
							This will make Item.add_report_sect more usable for plugins.
See https://github.com/eisensheng/pytest-catchlog/pull/7  
							
						 
						
							2015-09-22 20:29:16 +02:00  
				
					
						
							
							
								 
						
							
								ea9a491fb3 
								
							 
						 
						
							
							
								
								add an acceptance test for cache write errors  
							
							
							
						 
						
							2015-09-22 20:24:37 +02:00  
				
					
						
							
							
								 
						
							
								ca460e11e6 
								
							 
						 
						
							
							
								
								Merge pull request  #1051  from Akasurde/issue_1027  
							
							... 
							
							
							
							Added minor documentation change in python.py 
							
						 
						
							2015-09-22 17:09:25 +02:00  
				
					
						
							
							
								 
						
							
								dc1ce51ac2 
								
							 
						 
						
							
							
								
								Added minor documentation change  
							
							... 
							
							
							
							Signed-off-by: Abhijeet Kasurde <akasurde@redhat.com> 
							
						 
						
							2015-09-22 20:15:49 +05:30  
				
					
						
							
							
								 
						
							
								29f4da93d4 
								
							 
						 
						
							
							
								
								handle access errors when writing cache files silently as pytest warning,  fixes   #1039  
							
							
							
						 
						
							2015-09-22 16:28:19 +02:00  
				
					
						
							
							
								 
						
							
								36924b59bd 
								
							 
						 
						
							
							
								
								Merge branch '653-deprecated-context-manager' of  https://github.com/chiller/pytest  into features  
							
							
							
						 
						
							2015-09-22 15:14:06 +02:00  
				
					
						
							
							
								 
						
							
								48df2f6842 
								
							 
						 
						
							
							
								
								Merge branch 'master' into features  
							
							
							
						 
						
							2015-09-22 11:23:05 +02:00  
				
					
						
							
							
								 
						
							
								41d61ed221 
								
							 
						 
						
							
							
								
								Merge pull request  #1023  from RonnyPfannschmidt/fix-877  
							
							... 
							
							
							
							Fix 877 
							
						 
						
							2015-09-22 11:17:02 +02:00  
				
					
						
							
							
								 
						
							
								97f7815feb 
								
							 
						 
						
							
							
								
								also change pytest version to target 2.9.0  
							
							
							
						 
						
							2015-09-22 11:01:33 +02:00  
				
					
						
							
							
								 
						
							
								e2f72ffed8 
								
							 
						 
						
							
							
								
								start bugfix changelog on master  
							
							
							
						 
						
							2015-09-22 10:59:23 +02:00  
				
					
						
							
							
								 
						
							
								9f77a8507e 
								
							 
						 
						
							
							
								
								removed mutation of global state, changed filter addition in WarningsRecorder  
							
							
							
						 
						
							2015-09-21 19:01:23 +01:00  
				
					
						
							
							
								 
						
							
								beaa8e55bd 
								
							 
						 
						
							
							
								
								Fixes   #653  use deprecated_call as context_manager  
							
							
							
						 
						
							2015-09-21 19:01:23 +01: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  
				
					
						
							
							
								 
						
							
								b1c9b8b415 
								
							 
						 
						
							
							
								
								Make tmpdir resiliant to user ids that do not exist  
							
							... 
							
							
							
							Previously, the tmpdir fixture would fail if the current process's user
id does not correspond to a valid user (e.g. running pytest in a Docker
container with 'docker run -u'). 
							
						 
						
							2015-09-18 21:26:19 -04:00  
				
					
						
							
							
								 
						
							
								7658f60146 
								
							 
						 
						
							
							
								
								#877  - reencoding causes typeerrors on python2  
							
							
							
						 
						
							2015-09-19 00:30:01 +02:00  
				
					
						
							
							
								 
						
							
								49c99a41ea 
								
							 
						 
						
							
							
								
								reencode non-ascii python2 assertion reprs,  fixes   #877  
							
							... 
							
							
							
							i decided against using a warning since the problem goes away with python3
the support code can be removed once we drop python2 in 10 years or so 
							
						 
						
							2015-09-19 00:30:01 +02:00  
				
					
						
							
							
								 
						
							
								f02d9425f9 
								
							 
						 
						
							
							
								
								Bump version to 2.8.0  
							
							
							
						 
						
							2015-09-18 19:04:20 -03:00  
				
					
						
							
							
								 
						
							
								1aca998f3f 
								
							 
						 
						
							
							
								
								Merge pull request  #1012  from lukas-bednar/junitxml_plugin  
							
							... 
							
							
							
							junitxml: align custom properties with junit format 
							
						 
						
							2015-09-18 16:01:22 +02:00  
				
					
						
							
							
								 
						
							
								02a2272cfe 
								
							 
						 
						
							
							
								
								junitxml: move custom properties to properties element  
							
							... 
							
							
							
							<testsuite>
  <testcase>
    <properties>
      <property name="ABC" value="XYZ" />
      <property name="DEF" value="ZYX" />
    </properties>
  </testcase>
</testsuite> 
							
						 
						
							2015-09-17 15:56:41 +02:00  
				
					
						
							
							
								 
						
							
								fe8def98e4 
								
							 
						 
						
							
							
								
								Merge pull request  #1020  from hpk42/pluggy031  
							
							... 
							
							
							
							re-vendor pluggy to 0.3.1 release and also fix the README 
							
						 
						
							2015-09-17 14:41:32 +02:00  
				
					
						
							
							
								 
						
							
								f4bfd571ee 
								
							 
						 
						
							
							
								
								re-vendor pluggy to 0.3.1 release and also fix the README  
							
							
							
						 
						
							2015-09-17 13:54:23 +02:00  
				
					
						
							
							
								 
						
							
								baf5b5d005 
								
							 
						 
						
							
							
								
								update changelog/author info, bump version number  
							
							
							
						 
						
							2015-09-17 13:43:39 +02:00  
				
					
						
							
							
								 
						
							
								3bcda48ba4 
								
							 
						 
						
							
							
								
								Merge pull request  #1009  from mdboom/deprecation-warnings  
							
							... 
							
							
							
							avoid deprecation warnings, introduce helpers. 
							
						 
						
							2015-09-17 13:37:26 +02:00  
				
					
						
							
							
								 
						
							
								7eb1211192 
								
							 
						 
						
							
							
								
								revert setuptools_scm addition introduced with  f22d14b105 
							
							
							
						 
						
							2015-09-17 12:58:04 +02:00  
				
					
						
							
							
								 
						
							
								f978b545c5 
								
							 
						 
						
							
							
								
								Merge pull request  #1016  from hpk42/importappend3  
							
							... 
							
							
							
							revert importing test module behaviour to prepend by default 
							
						 
						
							2015-09-17 12:41:28 +02:00  
				
					
						
							
							
								 
						
							
								6192e74f03 
								
							 
						 
						
							
							
								
								remove __init__.py as advised by ronny  
							
							
							
						 
						
							2015-09-17 10:51:03 +02:00  
				
					
						
							
							
								 
						
							
								a62d12634c 
								
							 
						 
						
							
							
								
								revert importing test module behaviour to prepend by default  
							
							
							
						 
						
							2015-09-16 22:12:20 +02:00  
				
					
						
							
							
								 
						
							
								886ac82c43 
								
							 
						 
						
							
							
								
								Merge pull request  #1013  from nicoddemus/issue1010  
							
							... 
							
							
							
							Make tmpdir more resilient in case environment variables required by getpass are missing 
							
						 
						
							2015-09-16 21:57:44 +02:00  
				
					
						
							
							
								 
						
							
								2575053697 
								
							 
						 
						
							
							
								
								Merge pull request  #1015  from hpk42/cache-integration  
							
							... 
							
							
							
							refined pytest-cache integration 
							
						 
						
							2015-09-16 21:46:46 +02:00  
				
					
						
							
							
								 
						
							
								130e6cf8a2 
								
							 
						 
						
							
							
								
								Use temproot as a fallback if the current user couldn't be obtained  
							
							
							
						 
						
							2015-09-16 16:42:07 -03:00  
				
					
						
							
							
								 
						
							
								45065e4e2e 
								
							 
						 
						
							
							
								
								refine command line option naming and docs  
							
							
							
						 
						
							2015-09-16 20:41:22 +02:00  
				
					
						
							
							
								 
						
							
								1150e87e31 
								
							 
						 
						
							
							
								
								Extract get_user logic into a separate function  
							
							
							
						 
						
							2015-09-16 12:47:50 -03:00  
				
					
						
							
							
								 
						
							
								6676aeda5a 
								
							 
						 
						
							
							
								
								Make tmpdir more resilient in case environment variables required by getpass are missing  
							
							... 
							
							
							
							Fix  #1010  
						
							2015-09-16 12:20:07 -03:00  
				
					
						
							
							
								 
						
							
								bf74401fd3 
								
							 
						 
						
							
							
								
								Use __code__.co_argcount  
							
							
							
						 
						
							2015-09-16 11:05:54 -04:00  
				
					
						
							
							
								 
						
							
								08a572086b 
								
							 
						 
						
							
							
								
								Fix lookup of special values  
							
							
							
						 
						
							2015-09-16 11:02:36 -04:00  
				
					
						
							
							
								 
						
							
								9c19728d2b 
								
							 
						 
						
							
							
								
								Fix checking for args  
							
							
							
						 
						
							2015-09-16 06:45:51 -04:00  
				
					
						
							
							
								 
						
							
								859259ddae 
								
							 
						 
						
							
							
								
								Simplify  
							
							
							
						 
						
							2015-09-16 06:43:16 -04:00  
				
					
						
							
							
								 
						
							
								a0cefb3213 
								
							 
						 
						
							
							
								
								Use inspect.signature instead of inspect.getargspec  
							
							
							
						 
						
							2015-09-16 06:33:53 -04:00