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  
				
					
						
							
							
								 
						
							
								3328cd2620 
								
							 
						 
						
							
							
								
								Make assert in test_str_args_deprecated more resilient  
							
							... 
							
							
							
							This attempts to fix CI which broke because of this test.
Other warnings introduced in the future could break
this test. 
							
						 
						
							2016-07-14 18:37:59 -03:00  
				
					
						
							
							
								 
						
							
								350ebc9167 
								
							 
						 
						
							
							
								
								Merge pull request  #1730  from RedBeardCode/pytest-1536  
							
							... 
							
							
							
							Added confcutdir in testing/test_conftest.py::test_conftest_import_or… 
							
						 
						
							2016-07-14 17:02:58 -03:00  
				
					
						
							
							
								 
						
							
								24fbbbef1f 
								
							 
						 
						
							
							
								
								Merge pull request  #1641  from flub/rewrite-plugins  
							
							... 
							
							
							
							Rewrite plugins 
							
						 
						
							2016-07-14 19:39:15 +01:00  
				
					
						
							
							
								 
						
							
								22bb43413f 
								
							 
						 
						
							
							
								
								Added confcutdir in testing/test_conftest.py::test_conftest_import_order and  
							
							... 
							
							
							
							testing/python/fixture.py::TestAutouseManagement::()::
  test_class_function_parametrization_finalization to avoid problems with
  abandoned conftest.py files in /tmp dir.
  Fixes  #1536  
							
						 
						
							2016-07-14 18:15:38 +02: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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								1451a1ab00 
								
							 
						 
						
							
							
								
								remove unsupported python versions from code/source xfail  
							
							
							
						 
						
							2016-06-30 10:03:40 +02:00  
				
					
						
							
							
								 
						
							
								ccd395ffe0 
								
							 
						 
						
							
							
								
								Merge pull request  #1659  from RonnyPfannschmidt/failtest-586  
							
							... 
							
							
							
							xfailing test for #568  
							
						 
						
							2016-06-27 07:38:14 -03:00  
				
					
						
							
							
								 
						
							
								76756c0c0b 
								
							 
						 
						
							
							
								
								mark tests: use better name of the test for  #568  
							
							
							
						 
						
							2016-06-27 11:57:21 +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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								6d4cee2159 
								
							 
						 
						
							
							
								
								Add a test for indirect use of tuple in the assert that should not cause a warning  
							
							
							
						 
						
							2016-06-26 02:21:51 +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  
				
					
						
							
							
								 
						
							
								95b83958f4 
								
							 
						 
						
							
							
								
								add xfailing test for issue  #568  
							
							
							
						 
						
							2016-06-25 15:49:23 +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  
				
					
						
							
							
								 
						
							
								9877bf47e3 
								
							 
						 
						
							
							
								
								Improve commenting for setupplan unittest.  
							
							
							
						 
						
							2016-06-25 12:21:31 +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  
				
					
						
							
							
								 
						
							
								6359e75ff8 
								
							 
						 
						
							
							
								
								Trivial spelling fix in runtest_setup.py  
							
							
							
						 
						
							2016-06-22 20:18:00 +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  
				
					
						
							
							
								 
						
							
								f7d50dfa91 
								
							 
						 
						
							
							
								
								Add a test for handling of dynamic requests for fixtures from other fixtures  
							
							
							
						 
						
							2016-06-22 17:24:55 +02:00