f825b4979b 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into features  
							
							
							
						 
						
							2017-09-05 19:44:33 -03:00  
				
					
						
							
							
								 
						
							
								9e62a31b63 
								
							 
						 
						
							
							
								
								Merge pull request  #2650  from srinivasreddy/2642  
							
							... 
							
							
							
							Fixed#2642: Convert py module references to six module 
							
						 
						
							2017-08-04 09:21:51 +02:00  
				
					
						
							
							
								 
						
							
								dc563e4954 
								
							 
						 
						
							
							
								
								convert py module references to six module  
							
							
							
						 
						
							2017-08-04 08:05:03 +05:30  
				
					
						
							
							
								 
						
							
								7703dc921c 
								
							 
						 
						
							
							
								
								Only skip null bytes before setting the environment variable  
							
							... 
							
							
							
							As discussed, node ids have already been "ascii" sanitized by the
parametrization process 
							
						 
						
							2017-08-02 10:27:45 -03:00  
				
					
						
							
							
								 
						
							
								1deac2e210 
								
							 
						 
						
							
							
								
								Properly escape test names when setting PYTEST_CURRENT_TEST environment variable  
							
							... 
							
							
							
							Fix  #2644  
						
							2017-08-01 20:52:37 -03:00  
				
					
						
							
							
								 
						
							
								be401bc2f8 
								
							 
						 
						
							
							
								
								fix linting issues  
							
							
							
						 
						
							2017-07-28 18:27:59 +02:00  
				
					
						
							
							
								 
						
							
								06a49338b2 
								
							 
						 
						
							
							
								
								make Test Outcomes inherit from BaseException instead of exception  
							
							... 
							
							
							
							fixes  #580  
						
							2017-07-28 15:28:51 +02:00  
				
					
						
							
							
								 
						
							
								26ee2355d9 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/features' into fix-flake8-errors  
							
							
							
						 
						
							2017-07-19 17:09:05 -03:00  
				
					
						
							
							
								 
						
							
								2d4f1f022e 
								
							 
						 
						
							
							
								
								Introduce PYTEST_CURRENT_TEST environment variable  
							
							... 
							
							
							
							Fix  #2583  
						
							2017-07-19 10:01:50 -03:00  
				
					
						
							
							
								 
						
							
								b840622819 
								
							 
						 
						
							
							
								
								Fixed E302 flake8 errors  
							
							... 
							
							
							
							expected 2 blank lines, found 0 
							
						 
						
							2017-07-17 01:44:23 +02:00  
				
					
						
							
							
								 
						
							
								17a21d540b 
								
							 
						 
						
							
							
								
								Fixed E301 flake8 errors  
							
							... 
							
							
							
							expected 1 blank line, found 0 
							
						 
						
							2017-07-17 01:44:23 +02:00  
				
					
						
							
							
								 
						
							
								195a816522 
								
							 
						 
						
							
							
								
								Fixed E265 flake8 errors  
							
							... 
							
							
							
							block comment should start with ‘# ‘ 
							
						 
						
							2017-07-17 01:44:22 +02:00  
				
					
						
							
							
								 
						
							
								8f3eb6dfc7 
								
							 
						 
						
							
							
								
								Fixed E261 flake8 errors  
							
							... 
							
							
							
							at least two spaces before inline comment 
							
						 
						
							2017-07-17 01:44:22 +02:00  
				
					
						
							
							
								 
						
							
								617e510b6e 
								
							 
						 
						
							
							
								
								Fixed E231 flake8 errors  
							
							... 
							
							
							
							missing whitespace after ‘,’, ‘;’, or ‘:’ 
							
						 
						
							2017-07-17 01:44:22 +02:00  
				
					
						
							
							
								 
						
							
								4b22f270a3 
								
							 
						 
						
							
							
								
								Fixed E226 flake8 errors  
							
							... 
							
							
							
							missing whitespace around arithmetic operator 
							
						 
						
							2017-07-17 01:44:22 +02:00  
				
					
						
							
							
								 
						
							
								2e8caefcab 
								
							 
						 
						
							
							
								
								Fixed E225 flake8 errors  
							
							... 
							
							
							
							missing whitespace around operator 
							
						 
						
							2017-07-17 01:44:22 +02:00  
				
					
						
							
							
								 
						
							
								cf97159009 
								
							 
						 
						
							
							
								
								Fixed E128 flake8 errors  
							
							... 
							
							
							
							continuation line under-indented for visual indent 
							
						 
						
							2017-07-17 01:28:16 +02:00  
				
					
						
							
							
								 
						
							
								e855a79dd4 
								
							 
						 
						
							
							
								
								Fixed E126 flake8 errors  
							
							... 
							
							
							
							continuation line over-indented for hanging indent 
							
						 
						
							2017-07-17 01:28:16 +02:00  
				
					
						
							
							
								 
						
							
								0be97624b7 
								
							 
						 
						
							
							
								
								Fixed E121 flake8 errors  
							
							... 
							
							
							
							continuation line under-indented for hanging indent 
							
						 
						
							2017-07-17 01:28:16 +02:00  
				
					
						
							
							
								 
						
							
								d86c89e193 
								
							 
						 
						
							
							
								
								Revert refactor of old-style to new-style classes  
							
							... 
							
							
							
							As discussed in the mailing list, unfortunately this might break APIs
due to the subtle differences between new and old-style classes (see #2398 ).
This reverts commit d4afa1554b#2179 . 
							
						 
						
							2017-05-17 18:20:51 -03:00  
				
					
						
							
							
								 
						
							
								92f6ab1881 
								
							 
						 
						
							
							
								
								fix all singular internal module imports and add a test for them  
							
							
							
						 
						
							2017-03-28 11:45:06 +02:00  
				
					
						
							
							
								 
						
							
								6a02cdbb35 
								
							 
						 
						
							
							
								
								remove pytest_namespace from _pytest/runner.py  
							
							
							
						 
						
							2017-03-28 11:45:06 +02:00  
				
					
						
							
							
								 
						
							
								2c730743f1 
								
							 
						 
						
							
							
								
								Fix errors related to warnings raised by xdist  
							
							... 
							
							
							
							- pytester was creating a 'pexpect' directory to serve as temporary dir, but due to the fact that
   xdist adds the current directory to sys.path, that directory was being considered as candidate
   for import as a package. The directory is empty and a warning was being raised about
   it missing __init__ file, which is now turned into an error by our filterwarnings config
   in pytest.ini.
- Decided to play it safe and ignore any warnings during `pytest.importorskip`.
- pytest-xdist and execnet raise two warnings which should be fixed upstream:
   pytest-dev/pytest-xdist/issues/133 
							
						 
						
							2017-03-21 22:17:07 -03:00  
				
					
						
							
							
								 
						
							
								42a5d6bdfa 
								
							 
						 
						
							
							
								
								Add __future__ imports to all pytest modules  
							
							... 
							
							
							
							This prevents silly errors from creeping in Python 2 when testing in Python 3 
							
						 
						
							2017-03-16 22:45:40 -03:00  
				
					
						
							
							
								 
						
							
								d4afa1554b 
								
							 
						 
						
							
							
								
								Refactored old style classes to new style classes  
							
							
							
						 
						
							2017-01-08 22:52:42 -06: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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								e1674f60e7 
								
							 
						 
						
							
							
								
								remove memocollect anmd memoized_call  
							
							
							
						 
						
							2016-09-05 14:41:28 +02:00  
				
					
						
							
							
								 
						
							
								86ec3f37af 
								
							 
						 
						
							
							
								
								minor: s/no pkg_resources/pkg_resources/  
							
							
							
						 
						
							2016-08-20 18:47:42 +02:00  
				
					
						
							
							
								 
						
							
								63dc71c57e 
								
							 
						 
						
							
							
								
								Fix regression when using importorskip at module level  
							
							... 
							
							
							
							Fix  #1822  
						
							2016-08-19 18:21:25 -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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								1a5e530b98 
								
							 
						 
						
							
							
								
								Fix capturing with --setup-only/--setup-plan  
							
							
							
						 
						
							2016-06-23 10:23:04 +02:00  
				
					
						
							
							
								 
						
							
								61992b4e22 
								
							 
						 
						
							
							
								
								Implement --setup-plan option  
							
							
							
						 
						
							2016-06-22 16:45:36 +02:00  
				
					
						
							
							
								 
						
							
								5e0d78f4f1 
								
							 
						 
						
							
							
								
								Fix .format string failures on python 2.6  
							
							
							
						 
						
							2016-06-22 14:53:37 +02:00  
				
					
						
							
							
								 
						
							
								2c5c4f3f78 
								
							 
						 
						
							
							
								
								Add printing of fixture dependencies  
							
							
							
						 
						
							2016-06-22 12:54:36 +02:00  
				
					
						
							
							
								 
						
							
								6874c3a3cc 
								
							 
						 
						
							
							
								
								Factor setuponly code out of runtestprotocol().  
							
							
							
						 
						
							2016-06-22 11:09:54 +02:00  
				
					
						
							
							
								 
						
							
								499c9551c8 
								
							 
						 
						
							
							
								
								Implement working version of --setuponly  
							
							
							
						 
						
							2016-06-22 09:42:45 +02:00  
				
					
						
							
							
								 
						
							
								89df701ae9 
								
							 
						 
						
							
							
								
								Comment a workaround for  #1485 .  
							
							
							
						 
						
							2016-03-27 13:15:56 +03: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  
				
					
						
							
							
								 
						
							
								5d4703852e 
								
							 
						 
						
							
							
								
								Add test when using native strings with non-ascii chars  
							
							
							
						 
						
							2016-03-05 19:34:15 -03:00  
				
					
						
							
							
								 
						
							
								24d3e01548 
								
							 
						 
						
							
							
								
								pytest.fail with non-ascii characters raises an internal pytest error  
							
							... 
							
							
							
							Fix  #1178  
						
							2016-03-05 16:09:01 -03:00  
				
					
						
							
							
								 
						
							
								a912d3745b 
								
							 
						 
						
							
							
								
								Moved py.code code over to py.test  
							
							... 
							
							
							
							Fix  #103  
						
							2016-01-25 23:18:04 -02:00  
				
					
						
							
							
								 
						
							
								8b61a332ba 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'bukzor/features-merge-master' into features  
							
							
							
						 
						
							2015-12-10 19:03:55 -02: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  
				
					
						
							
							
								 
						
							
								6be6798cdf 
								
							 
						 
						
							
							
								
								Fix spelling: explicitely --> explicitly  
							
							
							
						 
						
							2015-12-01 01:41:47 -08: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