bc0f7e6243 
								
							 
						 
						
							
							
								
								Fix false-positive assert rewrite warnings when using 'pytest_plugins'  
							
							... 
							
							
							
							pytest would emit false positive warnings about assertion-rewrite when a
module appears multiple times in plugins which depend
on other plugins using the 'pytest_plugins' mechanism 
							
						 
						
							2016-12-01 15:50:08 -02:00  
				
					
						
							
							
								 
						
							
								c856537e71 
								
							 
						 
						
							
							
								
								Add warning for incorrect passing args to `-o`.  
							
							
							
						 
						
							2016-12-01 13:20:42 +01:00  
				
					
						
							
							
								 
						
							
								669332b7e0 
								
							 
						 
						
							
							
								
								Merge pull request  #2101  from wheerd/doctest-encoding  
							
							... 
							
							
							
							Added doctest encoding command line option 
							
						 
						
							2016-11-30 17:43:42 -02:00  
				
					
						
							
							
								 
						
							
								f5afd8cb54 
								
							 
						 
						
							
							
								
								Add missing `__test__` check for test discovery.  
							
							
							
						 
						
							2016-11-30 17:05:42 +01:00  
				
					
						
							
							
								 
						
							
								f8fef07b4c 
								
							 
						 
						
							
							
								
								Fixed the tests for python 2.6  
							
							
							
						 
						
							2016-11-30 14:19:07 +01:00  
				
					
						
							
							
								 
						
							
								c043bbb854 
								
							 
						 
						
							
							
								
								Changed the doctest_encoding option to an ini option.  
							
							... 
							
							
							
							Parametrized the tests for it. 
							
						 
						
							2016-11-30 11:43:33 +01:00  
				
					
						
							
							
								 
						
							
								929912de29 
								
							 
						 
						
							
							
								
								Changed the tests to pass on python 2 as well.  
							
							
							
						 
						
							2016-11-29 14:51:17 +01:00  
				
					
						
							
							
								 
						
							
								d254c6b0ae 
								
							 
						 
						
							
							
								
								Added some tests for --docstring-encoding option. Added option to specify encoding for internal testdir._makefile() for the tests.  
							
							
							
						 
						
							2016-11-29 12:29:16 +01:00  
				
					
						
							
							
								 
						
							
								4e1609b12e 
								
							 
						 
						
							
							
								
								Add `type` validation.  
							
							... 
							
							
							
							Argparse driven argument type validation is added for the
`--junit-xml` and `--confcutdir` arguments.
The commit partially reverts #2080 . Closes  #2089 . 
							
						 
						
							2016-11-28 02:16:01 +01:00  
				
					
						
							
							
								 
						
							
								b30a6d22c5 
								
							 
						 
						
							
							
								
								Merge branch 'master' into merge-master-into-features  
							
							
							
						 
						
							2016-11-27 17:30:40 -02:00  
				
					
						
							
							
								 
						
							
								6c5475660a 
								
							 
						 
						
							
							
								
								Add test case for  #595 .  
							
							... 
							
							
							
							This new test proves that reports do not capture stdout
by default when skipped. 
							
						 
						
							2016-11-26 18:49:24 +01:00  
				
					
						
							
							
								 
						
							
								33c0b06fdf 
								
							 
						 
						
							
							
								
								Fix error in approx's repr with complex numbers  
							
							... 
							
							
							
							Fix  #2082  
						
							2016-11-24 15:33:12 -02:00  
				
					
						
							
							
								 
						
							
								629d8e9fd6 
								
							 
						 
						
							
							
								
								Show an error if --confcutdir is not a valid directory  
							
							... 
							
							
							
							Fixes  #2078  
						
							2016-11-23 09:49:11 -02:00  
				
					
						
							
							
								 
						
							
								a5b5090c72 
								
							 
						 
						
							
							
								
								Merge pull request  #2070  from nedbat/bug2038  
							
							... 
							
							
							
							Don't fail if imp can't find the source for a .pyc file. #2038  
							
						 
						
							2016-11-22 17:45:29 +01:00  
				
					
						
							
							
								 
						
							
								bd343ef757 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/features' into integrate-pytest-warnings  
							
							
							
						 
						
							2016-11-22 14:35:39 -02:00  
				
					
						
							
							
								 
						
							
								5ce551e469 
								
							 
						 
						
							
							
								
								Merge pull request  #2075  from pytest-dev/master  
							
							... 
							
							
							
							Merge master into features after fixing flake8 errors 
							
						 
						
							2016-11-22 14:10:31 -02:00  
				
					
						
							
							
								 
						
							
								26ca5a702e 
								
							 
						 
						
							
							
								
								Add tests and integrated the original code into the core  
							
							
							
						 
						
							2016-11-21 08:26:43 -02:00  
				
					
						
							
							
								 
						
							
								984d4ce5ec 
								
							 
						 
						
							
							
								
								Fix test_excinfo_getstatement that broke because of whitespace changes  
							
							
							
						 
						
							2016-11-20 19:12:42 -02:00  
				
					
						
							
							
								 
						
							
								1eb5a690d4 
								
							 
						 
						
							
							
								
								Fix flake8 E305 and E306 errors  
							
							... 
							
							
							
							These errors started to appear with flake8-3.1.1, while they don't appear with
version 3.1.0 (weird). 
							
						 
						
							2016-11-20 18:59:15 -02:00  
				
					
						
							
							
								 
						
							
								06bb61bbe3 
								
							 
						 
						
							
							
								
								Don't fail if imp can't find the source for a .pyc file.  #2038  
							
							
							
						 
						
							2016-11-20 13:09:32 -05:00  
				
					
						
							
							
								 
						
							
								6876ba9ba6 
								
							 
						 
						
							
							
								
								Merge pull request  #1995  from mattduck/feat/restructure-assert-truncation  
							
							... 
							
							
							
							Restructure truncation of assertion messages 
							
						 
						
							2016-11-13 19:07:35 -02:00  
				
					
						
							
							
								 
						
							
								efc54b2e56 
								
							 
						 
						
							
							
								
								Merge branch 'master' into merge-master-features  
							
							
							
						 
						
							2016-11-11 18:56:53 -02:00  
				
					
						
							
							
								 
						
							
								1130b9f742 
								
							 
						 
						
							
							
								
								Fix the stubborn test about cyclic references left by pytest.raises  
							
							... 
							
							
							
							In Python 2, a context manager's __exit__() leaves sys.exc_info with the exception values even when it was supposed
to suppress the exception, so we explicitly call sys.exc_clear() which removes the traceback and allow the object
to be released.
Also updated the test to not depend on the immediate destruction of the object but instead to ensure it is not being
tracked as a cyclic reference.
Fix  #1965  
							
						 
						
							2016-11-08 22:20:27 -02:00  
				
					
						
							
							
								 
						
							
								552c7d4286 
								
							 
						 
						
							
							
								
								added test (thanks @nicoddemus) and added links in Changelog  
							
							
							
						 
						
							2016-11-08 22:13:02 -02:00  
				
					
						
							
							
								 
						
							
								e46e653794 
								
							 
						 
						
							
							
								
								Clean up unittest TestCase objects after tests are complete ( #1649 ).  
							
							... 
							
							
							
							Fix  #1649 
Users of unittest style TestCases will create expensive objects
in setUp. We should clean up TestCase instances that are lying
around so that they don't fill up memory. 
						
							2016-11-07 18:32:56 -08:00  
				
					
						
							
							
								 
						
							
								006a901b86 
								
							 
						 
						
							
							
								
								Properly handle exceptions in multiprocessing tasks  
							
							... 
							
							
							
							Fix  #1984  
						
							2016-11-03 10:48:43 -02:00  
				
					
						
							
							
								 
						
							
								e2bb4f893b 
								
							 
						 
						
							
							
								
								Fix teardown error message in generated xUnit XML  
							
							... 
							
							
							
							It was "test setup failure" even error happens on test teardown. 
							
						 
						
							2016-11-02 15:50:32 +03:00  
				
					
						
							
							
								 
						
							
								6f93ffb5d4 
								
							 
						 
						
							
							
								
								Report teardown output on test failure  
							
							... 
							
							
							
							Until now, teardown stdout/stderr output was not reported upon test failure.
However such output is sometime necessary to understand the failure.
fix  #442  
							
						 
						
							2016-10-30 09:52:46 +01:00  
				
					
						
							
							
								 
						
							
								e9668d75b8 
								
							 
						 
						
							
							
								
								turn RecordedWarning into a namedtuple  
							
							... 
							
							
							
							fixes  #2013  
						
							2016-10-24 15:23:53 +02:00  
				
					
						
							
							
								 
						
							
								35d154f580 
								
							 
						 
						
							
							
								
								Merge pull request  #2011  from nicoddemus/false-rewrite-warnings  
							
							... 
							
							
							
							Fix false-positive warnings from assertion rewrite hook 
							
						 
						
							2016-10-24 12:19:23 +02:00  
				
					
						
							
							
								 
						
							
								f2c01c5407 
								
							 
						 
						
							
							
								
								Restore pexpect tests and bypass isalive/wait on macOS. Ref  #2022 .  
							
							
							
						 
						
							2016-10-21 12:36:42 -04:00  
				
					
						
							
							
								 
						
							
								60a347aeb5 
								
							 
						 
						
							
							
								
								Also use flush where wait was called unconditionally  
							
							
							
						 
						
							2016-10-21 12:11:35 -04:00  
				
					
						
							
							
								 
						
							
								11ec96a927 
								
							 
						 
						
							
							
								
								Extract child flush as a staticmethod  
							
							
							
						 
						
							2016-10-21 12:10:35 -04:00  
				
					
						
							
							
								 
						
							
								9d00615bbf 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into merge-master-into-features  
							
							
							
						 
						
							2016-10-20 21:51:42 -02:00  
				
					
						
							
							
								 
						
							
								2a2b8cee09 
								
							 
						 
						
							
							
								
								Fix false-positive warnings from assertion rewrite hook  
							
							... 
							
							
							
							Fix  #2005  
						
							2016-10-20 21:40:57 -02:00  
				
					
						
							
							
								 
						
							
								620b384b69 
								
							 
						 
						
							
							
								
								Fix cmdline help message for custom options with two or more metavars  
							
							... 
							
							
							
							Fix  #2004  
						
							2016-10-20 20:34:39 -02:00  
				
					
						
							
							
								 
						
							
								acee88a118 
								
							 
						 
						
							
							
								
								Fix truncation tests: pyruntest() match  
							
							... 
							
							
							
							Fix issue with truncation tests for -vv and CI, where the test for
non-truncated output would return a positive match even on truncated output. 
							
						 
						
							2016-10-16 20:54:51 +01:00  
				
					
						
							
							
								 
						
							
								78eec0d7f8 
								
							 
						 
						
							
							
								
								Handle import errors with non-ascii messages when importing plugins  
							
							... 
							
							
							
							Fix  #1998  
						
							2016-10-12 18:19:32 -03:00  
				
					
						
							
							
								 
						
							
								0061d9bd3d 
								
							 
						 
						
							
							
								
								Fix flake8 (unused import, trailng whitespace)  
							
							
							
						 
						
							2016-10-11 00:17:15 +01:00  
				
					
						
							
							
								 
						
							
								b629da424e 
								
							 
						 
						
							
							
								
								Restructure truncation of assertion messages  
							
							... 
							
							
							
							This addresses ref https://github.com/pytest-dev/pytest/issues/1954 .
The current truncation for assertion explanations does not deal with long lines
properly:
- Previously if lines were too long it would display a "-n more lines"
  message.
- 999e7c6541 
							
						 
						
							2016-10-10 23:38:27 +01:00  
				
					
						
							
							
								 
						
							
								a1d446b8e8 
								
							 
						 
						
							
							
								
								Display traceback from Import errors using pytest's short representation  
							
							... 
							
							
							
							Also omit pytest's own modules and internal libraries (py and pluggy) in low verbosity
Fix  #1976  
							
						 
						
							2016-10-03 21:46:44 -03:00  
				
					
						
							
							
								 
						
							
								7d66e4eae1 
								
							 
						 
						
							
							
								
								Display full traceback from Import errors when collecting test modules  
							
							... 
							
							
							
							Fix  #1976  
						
							2016-10-03 20:47:44 -03:00  
				
					
						
							
							
								 
						
							
								336d7900c5 
								
							 
						 
						
							
							
								
								Fix test about pytest.skip message being used at global level  
							
							... 
							
							
							
							Fix  #1959  
						
							2016-10-01 13:38:52 -03:00  
				
					
						
							
							
								 
						
							
								654af0ba25 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into features  
							
							
							
						 
						
							2016-09-26 19:32:53 -03:00  
				
					
						
							
							
								 
						
							
								5e96edd435 
								
							 
						 
						
							
							
								
								Merge pull request  #1952  from davidszotten/pdbcls_without_pdb_on_fail  
							
							... 
							
							
							
							Pdbcls without pdb on fail 
							
						 
						
							2016-09-25 20:24:45 -03:00  
				
					
						
							
							
								 
						
							
								6db2f315fa 
								
							 
						 
						
							
							
								
								Explain a bad scope value to the user  
							
							
							
						 
						
							2016-09-21 16:40:58 -04:00  
				
					
						
							
							
								 
						
							
								d75748ef6f 
								
							 
						 
						
							
							
								
								test for calling set_trace with custom pdb cls  
							
							
							
						 
						
							2016-09-21 09:45:26 +00:00  
				
					
						
							
							
								 
						
							
								c7b4b8cf6f 
								
							 
						 
						
							
							
								
								test  
							
							
							
						 
						
							2016-09-21 09:45:23 +00:00  
				
					
						
							
							
								 
						
							
								8cba033bbb 
								
							 
						 
						
							
							
								
								added a test  
							
							
							
						 
						
							2016-09-20 02:47:59 +07:00  
				
					
						
							
							
								 
						
							
								887c097f8e 
								
							 
						 
						
							
							
								
								Merge pull request  #1951  from mattduck/feat/1512-dict-compare-output  
							
							... 
							
							
							
							Feat/1512 dict compare output 
							
						 
						
							2016-09-19 17:34:09 +01:00  
				
					
						
							
							
								 
						
							
								01db0f1cd1 
								
							 
						 
						
							
							
								
								Merge pull request  #1923  from RonnyPfannschmidt/mark-internal-value  
							
							... 
							
							
							
							use consistent inner repressentation for marks 
							
						 
						
							2016-09-19 15:30:22 +01:00  
				
					
						
							
							
								 
						
							
								dd64d823b9 
								
							 
						 
						
							
							
								
								Don't display dict common items if verbosity=1  
							
							... 
							
							
							
							Part one of https://github.com/pytest-dev/pytest/issues/1512 .
If verbosity=1, assertion explanations are truncated at 10 lines. In this
situation, it's more important to tell the user which dictionary items are
different than which are the same. 
							
						 
						
							2016-09-19 15:27:28 +01:00  
				
					
						
							
							
								 
						
							
								dc16fe2bb9 
								
							 
						 
						
							
							
								
								Merge junit-xml url attribute branch  
							
							... 
							
							
							
							Merge branch 'url_attr' of https://github.com/fushi/pytest  into junitxml-url 
							
						 
						
							2016-09-19 12:57:05 +01:00  
				
					
						
							
							
								 
						
							
								04cf5e1df4 
								
							 
						 
						
							
							
								
								Fixed assertion rewriting for plugins in development mode  
							
							... 
							
							
							
							Fix  #1934  
						
							2016-09-14 21:59:33 -03:00  
				
					
						
							
							
								 
						
							
								10094a3f09 
								
							 
						 
						
							
							
								
								use consistent inner repressentation for marks  
							
							
							
						 
						
							2016-09-08 09:52:22 +02:00  
				
					
						
							
							
								 
						
							
								1c9bd9278e 
								
							 
						 
						
							
							
								
								Merge pull request  #1913  from flub/builtin-assertion  
							
							... 
							
							
							
							Remove BuiltinAssertionError 
							
						 
						
							2016-09-05 16:53:13 +02:00  
				
					
						
							
							
								 
						
							
								28b1896e9a 
								
							 
						 
						
							
							
								
								Remove BuiltinAssertionError  
							
							... 
							
							
							
							We used to have this when we where patching the real Python
AssertionError for use with reinterpret, but reinterpret is now
gone so we no longer need this as it is not used by rewrite. 
							
						 
						
							2016-09-05 15:29:09 +02:00  
				
					
						
							
							
								 
						
							
								1e10de574d 
								
							 
						 
						
							
							
								
								The "ids" argument to "parametrize" again accepts unicode strings in Python 2  
							
							... 
							
							
							
							Fixes  #1905  
						
							2016-09-02 18:38:15 -03:00  
				
					
						
							
							
								 
						
							
								696a9112be 
								
							 
						 
						
							
							
								
								integrating review commets of @nicoddemus  
							
							... 
							
							
							
							plus small scale refactoring 
							
						 
						
							2016-08-31 22:33:47 +02:00  
				
					
						
							
							
								 
						
							
								be08223d5a 
								
							 
						 
						
							
							
								
								Merge branch 'master' into disable_tearDown_and_cleanups_for_post_mortem_debugging  
							
							... 
							
							
							
							Conflicts:
	CHANGELOG.rst 
							
						 
						
							2016-08-31 20:35:31 +02:00  
				
					
						
							
							
								 
						
							
								10b3274924 
								
							 
						 
						
							
							
								
								adding corresponding test, authors and changelog  
							
							
							
						 
						
							2016-08-31 20:22:54 +02:00  
				
					
						
							
							
								 
						
							
								c8a366e551 
								
							 
						 
						
							
							
								
								Fix issue where pytest_plugins as string was marking wrong modules for rewrite  
							
							... 
							
							
							
							Fix  #1888  
						
							2016-08-30 22:53:50 -03:00  
				
					
						
							
							
								 
						
							
								856ad719d3 
								
							 
						 
						
							
							
								
								Fix UnicodeEncodeError when string comparison with unicode has failed.  
							
							
							
						 
						
							2016-08-26 09:41:40 +09:00  
				
					
						
							
							
								 
						
							
								1b259f70f3 
								
							 
						 
						
							
							
								
								Testcase reports with a url attribute will now properly write this to junitxml  
							
							
							
						 
						
							2016-08-25 13:08:51 -07:00  
				
					
						
							
							
								 
						
							
								a152ea2dbb 
								
							 
						 
						
							
							
								
								Add buffer attribute to stdin stub  
							
							
							
						 
						
							2016-08-24 16:26:34 -07:00  
				
					
						
							
							
								 
						
							
								972a5fb5d5 
								
							 
						 
						
							
							
								
								Improve error message when passing non-string ids to pytest.mark.parametrize  
							
							... 
							
							
							
							Fix  #1857  
						
							2016-08-23 23:31:45 -03:00  
				
					
						
							
							
								 
						
							
								df200297e2 
								
							 
						 
						
							
							
								
								Fix internal error when parametrizing using and empty list of ids()  
							
							... 
							
							
							
							Fix  #1849  
						
							2016-08-23 18:18:46 -03:00  
				
					
						
							
							
								 
						
							
								53a0e2b118 
								
							 
						 
						
							
							
								
								Fix code which guesses parametrized scope based on arguments  
							
							... 
							
							
							
							Fix  #1832  
						
							2016-08-22 21:05:41 -03:00  
				
					
						
							
							
								 
						
							
								6a8160b318 
								
							 
						 
						
							
							
								
								Add acceptance test for module loader  
							
							... 
							
							
							
							Related to #1837  
							
						 
						
							2016-08-22 17:57:25 -03:00  
				
					
						
							
							
								 
						
							
								a20c3f9c44 
								
							 
						 
						
							
							
								
								Merge pull request  #1827  from blueyed/Fix-spelling-s-outside-a-outside-of-a-  
							
							... 
							
							
							
							Fix spelling: s/outside a/outside of a/ 
							
						 
						
							2016-08-20 20:04:58 +02:00  
				
					
						
							
							
								 
						
							
								e306a53999 
								
							 
						 
						
							
							
								
								Fix spelling: s/outside a/outside of a/  
							
							
							
						 
						
							2016-08-20 18:43:39 +02:00  
				
					
						
							
							
								 
						
							
								63dc71c57e 
								
							 
						 
						
							
							
								
								Fix regression when using importorskip at module level  
							
							... 
							
							
							
							Fix  #1822  
						
							2016-08-19 18:21:25 -03:00  
				
					
						
							
							
								 
						
							
								3ba475c0f2 
								
							 
						 
						
							
							
								
								Move internal _is_unittest_unexpected_success_a_failure to "compat" module  
							
							... 
							
							
							
							Fix  #1815  
						
							2016-08-17 22:50:10 -03:00  
				
					
						
							
							
								 
						
							
								463e6572c5 
								
							 
						 
						
							
							
								
								Merge branch 'master' into merge-master-into-features  
							
							... 
							
							
							
							Preparing for 3.0 
							
						 
						
							2016-08-17 22:39:23 -03:00  
				
					
						
							
							
								 
						
							
								224ef67374 
								
							 
						 
						
							
							
								
								Quick fix for tests in config depended on the current directory  
							
							... 
							
							
							
							When running those tests from pytest's root folder, they would
fail because they would end up picking pytest's own pytest.ini 
							
						 
						
							2016-08-17 21:32:05 -03:00  
				
					
						
							
							
								 
						
							
								4ed412eb59 
								
							 
						 
						
							
							
								
								unittest's unexpectedSuccess should work as non-strict xpass  
							
							... 
							
							
							
							Make sure tests for that behavior obtain the same return code
using either pytest or unittest to run the same file 
							
						 
						
							2016-08-17 21:32:04 -03:00  
				
					
						
							
							
								 
						
							
								dfc659f781 
								
							 
						 
						
							
							
								
								Fix sys.version_info expression in xfail marker  
							
							
							
						 
						
							2016-08-17 23:32:56 +01:00  
				
					
						
							
							
								 
						
							
								0173952961 
								
							 
						 
						
							
							
								
								Fix py3 xfail expression evaluation and parametrize strict  
							
							
							
						 
						
							2016-08-17 23:15:14 +01:00  
				
					
						
							
							
								 
						
							
								767c28d422 
								
							 
						 
						
							
							
								
								Fix broken test in test_junitxml  
							
							
							
						 
						
							2016-08-17 22:32:27 +01:00  
				
					
						
							
							
								 
						
							
								d1f2f779ee 
								
							 
						 
						
							
							
								
								Use a better xfail reason  
							
							
							
						 
						
							2016-08-17 22:31:56 +01:00  
				
					
						
							
							
								 
						
							
								bb3d6d87b6 
								
							 
						 
						
							
							
								
								Merge branch 'master' into fix-report-outcome-for-xpass  
							
							
							
						 
						
							2016-08-17 22:15:29 +01:00  
				
					
						
							
							
								 
						
							
								018197d72a 
								
							 
						 
						
							
							
								
								Fix broken test in test_skipping and add one for strict xfail  
							
							
							
						 
						
							2016-08-17 22:14:51 +01:00  
				
					
						
							
							
								 
						
							
								ea379e0e4f 
								
							 
						 
						
							
							
								
								Fix test in test_junitxml and add one for strict  
							
							
							
						 
						
							2016-08-17 22:02:54 +01:00  
				
					
						
							
							
								 
						
							
								789e4670e7 
								
							 
						 
						
							
							
								
								Merge pull request  #1813  from nicoddemus/pytest-setup.cfg  
							
							... 
							
							
							
							Support [tool:pytest] in setup.cfg files 
							
						 
						
							2016-08-17 20:33:57 +02:00  
				
					
						
							
							
								 
						
							
								c8ab79402c 
								
							 
						 
						
							
							
								
								Merge pull request  #1811  from nicoddemus/revert-invocation-fixtures  
							
							... 
							
							
							
							Revert invocation-fixtures code 
							
						 
						
							2016-08-17 20:32:54 +02:00  
				
					
						
							
							
								 
						
							
								ab86dea529 
								
							 
						 
						
							
							
								
								Support [tool:pytest] in setup.cfg files  
							
							... 
							
							
							
							Also deprecate [pytest] usage in setup.cfg files
Fix  #567  
							
						 
						
							2016-08-17 08:19:38 -03:00  
				
					
						
							
							
								 
						
							
								707b6b5e3f 
								
							 
						 
						
							
							
								
								Revert all invocation-fixtures code  
							
							... 
							
							
							
							Due to a serious regression found in #1794 , it was decided to pull off
invocation features from 3.0 so it can be (hopefully) re-introduced
in 3.1 
							
						 
						
							2016-08-17 08:12:55 -03:00  
				
					
						
							
							
								 
						
							
								f25771a101 
								
							 
						 
						
							
							
								
								Deprecate --resultlog cmdline option  
							
							... 
							
							
							
							Fix  #830  
						
							2016-08-16 21:40:34 -03:00  
				
					
						
							
							
								 
						
							
								55ec1d7f56 
								
							 
						 
						
							
							
								
								Update test_junitxml.py to interpret XPASS as passed  
							
							
							
						 
						
							2016-08-15 23:58:16 +01:00  
				
					
						
							
							
								 
						
							
								ca5957932b 
								
							 
						 
						
							
							
								
								Merge pull request  #1806  from blueyed/fix-off-by-one-error-with-warnings  
							
							... 
							
							
							
							Fix off-by-one error with lines from request.node.warn 
							
						 
						
							2016-08-15 19:04:00 -03:00  
				
					
						
							
							
								 
						
							
								c163cc7937 
								
							 
						 
						
							
							
								
								Improve display of continuation lines with multiline errors  
							
							... 
							
							
							
							Fixes https://github.com/pytest-dev/pytest/issues/717 .
Follow-up to https://github.com/pytest-dev/pytest/pull/1762 . 
							
						 
						
							2016-08-14 22:34:31 +02:00  
				
					
						
							
							
								 
						
							
								16cb5d01b1 
								
							 
						 
						
							
							
								
								Fix off-by-one error with lines from request.node.warn  
							
							... 
							
							
							
							The line numbers in `node.location` seem to be zero-based?! 
							
						 
						
							2016-08-14 22:10:01 +02:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								14a4dd0697 
								
							 
						 
						
							
							
								
								Extend test to verify longrepr in stdout  
							
							
							
						 
						
							2016-08-12 23:31:38 +01:00  
				
					
						
							
							
								 
						
							
								10a6ed1707 
								
							 
						 
						
							
							
								
								Update unittest test to expect failure for an unexpected success  
							
							
							
						 
						
							2016-08-12 23:18:02 +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  
				
					
						
							
							
								 
						
							
								1a79137d04 
								
							 
						 
						
							
							
								
								Add originalname attribute to Function  
							
							... 
							
							
							
							Related to #1790  
							
						 
						
							2016-08-03 22:56:12 -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  
				
					
						
							
							
								 
						
							
								48f4e18280 
								
							 
						 
						
							
							
								
								fix deselect tests to match reason removal  
							
							
							
						 
						
							2016-08-02 10:43:25 +02: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  
				
					
						
							
							
								 
						
							
								31c5194562 
								
							 
						 
						
							
							
								
								Fix broken test in py3k  
							
							
							
						 
						
							2016-08-01 18:35:42 -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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								e9a67e6702 
								
							 
						 
						
							
							
								
								Adjust test involving FixtureLookupErrorRepr  
							
							... 
							
							
							
							I added a starting 'E' to the expected error messages.
The tests were still passing after the previous patch but I think it's
better to have stricter tests. 
							
						 
						
							2016-07-23 23:45:07 +02:00  
				
					
						
							
							
								 
						
							
								1704b7d265 
								
							 
						 
						
							
							
								
								Test case for overriding autouse fixtures  
							
							... 
							
							
							
							Test case for overriding autouse fixture with a parametrized fixture.
The test covers the problem explained in the issue 1601
Adding Diego Russo to AUTHORS 
							
						 
						
							2016-07-23 16:53:39 +02:00  
				
					
						
							
							
								 
						
							
								f26fa5a441 
								
							 
						 
						
							
							
								
								changed error message for unused parametrize name  
							
							
							
						 
						
							2016-07-23 16:49:20 +02:00  
				
					
						
							
							
								 
						
							
								d5a70acd48 
								
							 
						 
						
							
							
								
								Simplify test in test_doctest_report_none_or_only_first_failure.  
							
							
							
						 
						
							2016-07-23 15:58:13 +02:00  
				
					
						
							
							
								 
						
							
								e229a27e8b 
								
							 
						 
						
							
							
								
								using @pytest.mark.parametrize instead of calling one test many times from another as suggested by @nicoddemus in pr  #1754  
							
							
							
						 
						
							2016-07-23 15:21:59 +02:00  
				
					
						
							
							
								 
						
							
								1a33025a76 
								
							 
						 
						
							
							
								
								Refactors test to be in its own class, as discussed with @nicoddemus.  
							
							
							
						 
						
							2016-07-23 15:16:23 +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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								6aea164b6d 
								
							 
						 
						
							
							
								
								Add more tests for invocation scoped fixtures  
							
							
							
						 
						
							2016-07-20 21:02:36 -03:00  
				
					
						
							
							
								 
						
							
								e0f08a73ab 
								
							 
						 
						
							
							
								
								Merge branch 'features' into conftest-exception-printing  
							
							
							
						 
						
							2016-07-20 19:33:36 -03:00  
				
					
						
							
							
								 
						
							
								3fd8257c17 
								
							 
						 
						
							
							
								
								add test for --maxfail=NUM overiding -x  
							
							
							
						 
						
							2016-07-20 17:20:10 +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  
				
					
						
							
							
								 
						
							
								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