9f85584656 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/features' into integrate-pytest-warnings  
							
							
							
						 
						
							2017-03-20 19:59:05 -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  
				
					
						
							
							
								 
						
							
								0baed781fe 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/features' into integrate-pytest-warnings  
							
							
							
						 
						
							2017-03-16 20:02:06 -03:00  
				
					
						
							
							
								 
						
							
								337f891d78 
								
							 
						 
						
							
							
								
								Fixed tests  
							
							
							
						 
						
							2017-03-16 20:01:47 -03:00  
				
					
						
							
							
								 
						
							
								1e0cf5ce4d 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into merge-master-into-features  
							
							... 
							
							
							
							# Conflicts:
#	AUTHORS
#	CHANGELOG.rst
#	_pytest/pytester.py 
							
						 
						
							2017-03-10 15:54:05 -03:00  
				
					
						
							
							
								 
						
							
								cee578e327 
								
							 
						 
						
							
							
								
								Fix trailing whitespace in terminal output  
							
							
							
						 
						
							2017-03-05 23:20:55 +03:00  
				
					
						
							
							
								 
						
							
								fb0b90646e 
								
							 
						 
						
							
							
								
								New-style classes implemented for python 2.7 -  #2147  
							
							
							
						 
						
							2017-02-16 20:28:17 +01: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  
				
					
						
							
							
								 
						
							
								7d66e4eae1 
								
							 
						 
						
							
							
								
								Display full traceback from Import errors when collecting test modules  
							
							... 
							
							
							
							Fix  #1976  
						
							2016-10-03 20:47:44 -03: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  
				
					
						
							
							
								 
						
							
								48f4e18280 
								
							 
						 
						
							
							
								
								fix deselect tests to match reason removal  
							
							
							
						 
						
							2016-08-02 10:43:25 +02: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  
				
					
						
							
							
								 
						
							
								458ecae1df 
								
							 
						 
						
							
							
								
								Replace all usages of "pytest_funcarg__" for @pytest.fixture  
							
							
							
						 
						
							2016-07-11 22:21:52 -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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								083f64100d 
								
							 
						 
						
							
							
								
								merge master into features  
							
							
							
						 
						
							2016-06-22 14:39:33 +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  
				
					
						
							
							
								 
						
							
								2a3cbdf4d1 
								
							 
						 
						
							
							
								
								Cut a dead test helper function  
							
							... 
							
							
							
							This appears to have been unused since commit
320835d 
							
						 
						
							2016-06-15 18:26:10 -07: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  
				
					
						
							
							
								 
						
							
								96a331e32f 
								
							 
						 
						
							
							
								
								Display collect progress only when in a terminal  
							
							... 
							
							
							
							Fix  #1397  
						
							2016-02-20 14:38:30 -02:00  
				
					
						
							
							
								 
						
							
								bfa2fadac1 
								
							 
						 
						
							
							
								
								fix issue  #1366  by showing a note on the --fulltrace option  
							
							
							
						 
						
							2016-02-10 20:27:50 +01:00  
				
					
						
							
							
								 
						
							
								a912d3745b 
								
							 
						 
						
							
							
								
								Moved py.code code over to py.test  
							
							... 
							
							
							
							Fix  #103  
						
							2016-01-25 23:18:04 -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  
				
					
						
							
							
								 
						
							
								8b61a332ba 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'bukzor/features-merge-master' into features  
							
							
							
						 
						
							2015-12-10 19:03:55 -02:00  
				
					
						
							
							
								 
						
							
								ccfd962170 
								
							 
						 
						
							
							
								
								Add "no -rP" case to test_pass_output_reporting  
							
							
							
						 
						
							2015-12-08 17:33:03 -10:00  
				
					
						
							
							
								 
						
							
								b417d7cb79 
								
							 
						 
						
							
							
								
								Add tests to test_terminal.py for -rp and -rP  
							
							
							
						 
						
							2015-12-08 15:54:23 -10: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  
				
					
						
							
							
								 
						
							
								2575053697 
								
							 
						 
						
							
							
								
								Merge pull request  #1015  from hpk42/cache-integration  
							
							... 
							
							
							
							refined pytest-cache integration 
							
						 
						
							2015-09-16 21:46:46 +02:00  
				
					
						
							
							
								 
						
							
								cd475c7b27 
								
							 
						 
						
							
							
								
								minor flake8 fixes  
							
							
							
						 
						
							2015-09-13 19:55:44 +02:00  
				
					
						
							
							
								 
						
							
								0b3f1b4a7c 
								
							 
						 
						
							
							
								
								Create `_pytest.vendored_packages` and _pytest._pluggy  
							
							... 
							
							
							
							- Replace imports from "pluggy" to "_pytest._pluggy"
- Fallback to import "pluggy" from global namespace if
  not found in _pytest.vendored_packges 
							
						 
						
							2015-09-07 13:01:54 -03:00  
				
					
						
							
							
								 
						
							
								e59471766a 
								
							 
						 
						
							
							
								
								Rename "warnings" to "pytest-warnings" in terminal output  
							
							... 
							
							
							
							Fix  #970  
						
							2015-08-27 19:59:52 -03:00  
				
					
						
							
							
								 
						
							
								287df16c9c 
								
							 
						 
						
							
							
								
								Merge pull request  #817  from nicoddemus/non-collection-exit-error  
							
							... 
							
							
							
							return non-zero exit code if no tests are collected 
							
						 
						
							2015-08-21 18:30:57 +02:00  
				
					
						
							
							
								 
						
							
								2ffd37b816 
								
							 
						 
						
							
							
								
								return non-zero exit code if no tests are collected  
							
							... 
							
							
							
							Fix  #812 
Fix  #500  
						
							2015-08-18 07:35:02 -03:00  
				
					
						
							
							
								 
						
							
								7758bcd141 
								
							 
						 
						
							
							
								
								terminalwriter: extract plugin printing logic and add positive unittests  
							
							
							
						 
						
							2015-08-17 09:10:01 +02:00  
				
					
						
							
							
								 
						
							
								afcad74be8 
								
							 
						 
						
							
							
								
								PEP8ify parametrized-test parameters  
							
							
							
						 
						
							2015-07-02 13:39:05 -04:00  
				
					
						
							
							
								 
						
							
								6c395cb58c 
								
							 
						 
						
							
							
								
								Default color is now yellow  
							
							... 
							
							
							
							Passing tests override that default, making the color green; but several other
"boring" statuses (xfailed, xpassed, deselected, skipped) have no effect.
Net effect: if only "boring" tests are seen, or no tests at all, the summary
bar is yellow. 
							
						 
						
							2015-07-02 13:39:05 -04:00  
				
					
						
							
							
								 
						
							
								044d874c5b 
								
							 
						 
						
							
							
								
								If there are warnings, make the status bar yellow  
							
							... 
							
							
							
							Also if we see any statuses the code doesn't know about. 
							
						 
						
							2015-07-02 13:39:05 -04:00  
				
					
						
							
							
								 
						
							
								e07144aeb4 
								
							 
						 
						
							
							
								
								Add tests for the empty-key special case  
							
							
							
						 
						
							2015-07-02 13:39:05 -04:00  
				
					
						
							
							
								 
						
							
								7993afae46 
								
							 
						 
						
							
							
								
								test_summary_stats() now prints its parameter values  
							
							... 
							
							
							
							This makes it easier to identify failing tests. 
							
						 
						
							2015-07-02 13:39:05 -04:00  
				
					
						
							
							
								 
						
							
								bfc3e48fd5 
								
							 
						 
						
							
							
								
								Factor out build_summary_stats_line(), and add tests  
							
							... 
							
							
							
							--HG--
branch : esiegerman/summary_colors 
							
						 
						
							2015-07-02 13:39:04 -04:00  
				
					
						
							
							
								 
						
							
								d9a44098ce 
								
							 
						 
						
							
							
								
								use new pluggy api (now at 0.3.0) for adding hookcall monitoring  
							
							... 
							
							
							
							and reraise real keyboard interrupts during inline pytest runs
to allow for better stopping of the pytest tests.
--HG--
branch : plug30 
							
						 
						
							2015-05-07 11:02:55 +02:00  
				
					
						
							
							
								 
						
							
								23538bcd31 
								
							 
						 
						
							
							
								
								- some more adaptation to most recent pluggy API  
							
							... 
							
							
							
							- avoid using pluggin underscore api
- show pluggy version in header
--HG--
branch : pluggy1 
							
						 
						
							2015-05-05 21:53:04 +02:00  
				
					
						
							
							
								 
						
							
								424e5d1394 
								
							 
						 
						
							
							
								
								make test suite more tolerable against xdist causing warnings itself (which it does  
							
							... 
							
							
							
							currently)
--HG--
branch : plugtestfix 
							
						 
						
							2015-04-27 15:06:47 +02:00  
				
					
						
							
							
								 
						
							
								3a1374e69c 
								
							 
						 
						
							
							
								
								simplify plugins bookkeeping further, refine API  
							
							... 
							
							
							
							--HG--
branch : more_plugin 
							
						 
						
							2015-04-25 20:17:32 +02:00  
				
					
						
							
							
								 
						
							
								1ef49ac5ab 
								
							 
						 
						
							
							
								
								minimize HookRelay to become a pure container, refactor initialization and  
							
							... 
							
							
							
							tests of plugin management to be a bit better split between pytest
and pytest-independent bits
--HG--
branch : plugin_no_pytest 
							
						 
						
							2015-04-22 13:31:46 +02:00  
				
					
						
							
							
								 
						
							
								d73e689991 
								
							 
						 
						
							
							
								
								fix issue616 - conftest visibility fixes.  This is achieved by  
							
							... 
							
							
							
							refactoring how nodeid's are constructed.  They now are always
relative to the "common rootdir" of a test run which is determined by
finding a common ancestor of all testrun arguments.
--HG--
branch : issue616 
							
						 
						
							2015-02-26 21:56:44 +01:00