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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								ede4e9171f 
								
							 
						 
						
							
							
								
								Spelling fixes  
							
							
							
						 
						
							2017-02-15 17:00:58 +02:00  
				
					
						
							
							
								 
						
							
								91c6bef77a 
								
							 
						 
						
							
							
								
								Add venv to the default norecursedirs  
							
							... 
							
							
							
							venv (without a dot) is commonly used as a name for a virtualenv directory, and
we don't want to collect that. 
							
						 
						
							2017-02-15 14:55:12 +01:00  
				
					
						
							
							
								 
						
							
								713bdc1f9f 
								
							 
						 
						
							
							
								
								merge master into features  
							
							
							
						 
						
							2017-01-26 12:00:52 +01:00  
				
					
						
							
							
								 
						
							
								7b4afd8946 
								
							 
						 
						
							
							
								
								remove unused import  
							
							
							
						 
						
							2017-01-20 12:09:49 +01:00  
				
					
						
							
							
								 
						
							
								4082f4024a 
								
							 
						 
						
							
							
								
								comment out compatproperty deprecations  
							
							... 
							
							
							
							todo: reenable in the features branch 
							
						 
						
							2017-01-20 11:25:48 +01:00  
				
					
						
							
							
								 
						
							
								d4afa1554b 
								
							 
						 
						
							
							
								
								Refactored old style classes to new style classes  
							
							
							
						 
						
							2017-01-08 22:52:42 -06:00  
				
					
						
							
							
								 
						
							
								402fbe503a 
								
							 
						 
						
							
							
								
								Merge branch 'master' into merge-master-into-features  
							
							
							
						 
						
							2016-12-27 23:31:26 -02:00  
				
					
						
							
							
								 
						
							
								9c285dfc1d 
								
							 
						 
						
							
							
								
								fix   #2118  - rework Node._getcustomclass and Node compat properties  
							
							
							
						 
						
							2016-12-06 09:13:25 +01:00  
				
					
						
							
							
								 
						
							
								81528ea81f 
								
							 
						 
						
							
							
								
								Remove hook proxy cache  
							
							... 
							
							
							
							Fix  #2016  
						
							2016-12-02 07:32:11 -02: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  
				
					
						
							
							
								 
						
							
								0a30f072e6 
								
							 
						 
						
							
							
								
								Show name argment in compatproperty deprecation message  
							
							
							
						 
						
							2016-11-27 14:24:55 -02:00  
				
					
						
							
							
								 
						
							
								b38fad4b82 
								
							 
						 
						
							
							
								
								Add compatproperty deprecation warning.  
							
							
							
						 
						
							2016-11-27 14:24:55 -02:00  
				
					
						
							
							
								 
						
							
								c1b83cdeea 
								
							 
						 
						
							
							
								
								Add hint of Issue  #478  to error text  
							
							
							
						 
						
							2016-11-26 10:47:15 +00: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  
				
					
						
							
							
								 
						
							
								10094a3f09 
								
							 
						 
						
							
							
								
								use consistent inner repressentation for marks  
							
							
							
						 
						
							2016-09-08 09:52:22 +02:00  
				
					
						
							
							
								 
						
							
								e1674f60e7 
								
							 
						 
						
							
							
								
								remove memocollect anmd memoized_call  
							
							
							
						 
						
							2016-09-05 14:41:28 +02:00  
				
					
						
							
							
								 
						
							
								678750c8f8 
								
							 
						 
						
							
							
								
								Fix importer call  
							
							
							
						 
						
							2016-08-21 22:07:18 +02:00  
				
					
						
							
							
								 
						
							
								463e6572c5 
								
							 
						 
						
							
							
								
								Merge branch 'master' into merge-master-into-features  
							
							... 
							
							
							
							Preparing for 3.0 
							
						 
						
							2016-08-17 22:39:23 -03: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  
				
					
						
							
							
								 
						
							
								05728d1317 
								
							 
						 
						
							
							
								
								fix keep-duplicates help line.  
							
							
							
						 
						
							2016-07-26 09:53:12 +02:00  
				
					
						
							
							
								 
						
							
								c2864aba3d 
								
							 
						 
						
							
							
								
								Merge branch 'master' into merge-master  
							
							... 
							
							
							
							# Conflicts:
#	AUTHORS
#	CHANGELOG.rst
#	_pytest/monkeypatch.py
#	_pytest/python.py 
							
						 
						
							2016-07-25 19:06:29 -03:00  
				
					
						
							
							
								 
						
							
								9cf09cda7b 
								
							 
						 
						
							
							
								
								Remove some comments and improved changelog  
							
							
							
						 
						
							2016-07-25 18:41:03 -03:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								a309a571d9 
								
							 
						 
						
							
							
								
								Cleanups for  #1763  
							
							
							
						 
						
							2016-07-25 10:17:46 +02:00  
				
					
						
							
							
								 
						
							
								42adaf5a61 
								
							 
						 
						
							
							
								
								Fix   #1210  display msg for early calls to exit  
							
							
							
						 
						
							2016-07-24 14:16:34 +02:00  
				
					
						
							
							
								 
						
							
								2a05c311e9 
								
							 
						 
						
							
							
								
								implement exitfirst as store_const option  
							
							... 
							
							
							
							this makes it possible to override with a later maxfail 
							
						 
						
							2016-07-20 17:15:29 +02:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								d81ee9acfb 
								
							 
						 
						
							
							
								
								Merge pull request  #1597  from taschini/pyargs-fix  
							
							... 
							
							
							
							Ensure that a module within a namespace package can be found by --pyargs 
							
						 
						
							2016-06-19 14:20:52 -03:00  
				
					
						
							
							
								 
						
							
								ab8b2e75a3 
								
							 
						 
						
							
							
								
								Simplify default pytest_runtestloop  
							
							... 
							
							
							
							The inner function and the explanatory comment it makes necessary can
all be removed if we switch to an if/else rather than try/except for
this condition.
Perhaps this bit comes from my fondness for C, but I think I would
find this style clearer and easier to understand even if it weren't
for the Python 2 quirk that makes the other style require us to add an
unnecessary-looking function abstraction.  In any case, given that the
alternative does require that abstraction this is definitely simpler. 
							
						 
						
							2016-06-15 18:27:08 -07:00  
				
					
						
							
							
								 
						
							
								4d9e293b4d 
								
							 
						 
						
							
							
								
								Incorporated feedback ( #1597 ).  
							
							... 
							
							
							
							Fixed problem caused in a test on Windows by file left open by PyPy and not immediately garbage collected. 
							
						 
						
							2016-06-14 07:12:40 +02:00  
				
					
						
							
							
								 
						
							
								e2e6e31711 
								
							 
						 
						
							
							
								
								Ensure that a module within a namespace package can be found by --pyargs.  
							
							
							
						 
						
							2016-06-14 07:12:40 +02:00  
				
					
						
							
							
								 
						
							
								accd962c9f 
								
							 
						 
						
							
							
								
								Fixed issue shadowing error when missing argument on teardown_method  
							
							... 
							
							
							
							When the method argument is missing on teardown_method, the traceback is
100% internal to pytest, which with default options get pruned. Then
that traceback is empty, leading to a new exception as a traceback shall
not be empty.
This PR fixes that issue by pushing back the last stack on the
traceback, when the stacktrace is empty after pruning. Then the output
is still pruned, but gives meaningful information with the item where it
failed on the stack.
* fixes issue #1604 
Signed-off-by: Guyzmo <guyzmo+github@m0g.net> 
							
						 
						
							2016-06-12 03:45:24 +02:00  
				
					
						
							
							
								 
						
							
								09d163aa3a 
								
							 
						 
						
							
							
								
								[exception handling] Fix case the current working directory (CWD) gets deleted during testing.  
							
							... 
							
							
							
							Fixes  #1235 . 
						
							2016-06-08 15:18:23 +02:00  
				
					
						
							
							
								 
						
							
								d6dfb1a393 
								
							 
						 
						
							
							
								
								issue 1544: norecursedirs build & dist dirs  
							
							
							
						 
						
							2016-05-23 21:02:29 +01:00  
				
					
						
							
							
								 
						
							
								a1277aaf0e 
								
							 
						 
						
							
							
								
								added TODO comment to remove the parametrized workaround  
							
							
							
						 
						
							2016-03-15 23:42:25 +02:00  
				
					
						
							
							
								 
						
							
								1ee3d40dbe 
								
							 
						 
						
							
							
								
								allow parametrized nodes to be specified from command line  
							
							
							
						 
						
							2016-03-13 23:37:21 +02:00  
				
					
						
							
							
								 
						
							
								a912d3745b 
								
							 
						 
						
							
							
								
								Moved py.code code over to py.test  
							
							... 
							
							
							
							Fix  #103  
						
							2016-01-25 23:18:04 -02:00  
				
					
						
							
							
								 
						
							
								9a04879129 
								
							 
						 
						
							
							
								
								Remove commented out extrainit  
							
							... 
							
							
							
							Unused since 2012, and the docstring syntax is incorrect with
four quotes. 
							
						 
						
							2015-10-20 21:08:21 +11:00  
				
					
						
							
							
								 
						
							
								81018f1996 
								
							 
						 
						
							
							
								
								restrucure pytest.main.wrap_session to allow for non-testrun wraps  
							
							
							
						 
						
							2015-09-14 18:34:29 +02:00  
				
					
						
							
							
								 
						
							
								76f0988551 
								
							 
						 
						
							
							
								
								turn the pytest_logwarning hook historic  
							
							
							
						 
						
							2015-09-02 18:49:49 +02:00  
				
					
						
							
							
								 
						
							
								f730291904 
								
							 
						 
						
							
							
								
								Make testsfailed and testscollected public Session attributes  
							
							... 
							
							
							
							As suggested by @flub in review 
							
						 
						
							2015-08-18 07:35:02 -03:00  
				
					
						
							
							
								 
						
							
								2ffd37b816 
								
							 
						 
						
							
							
								
								return non-zero exit code if no tests are collected  
							
							... 
							
							
							
							Fix  #812 
Fix  #500  
						
							2015-08-18 07:35:02 -03:00  
				
					
						
							
							
								 
						
							
								62ca4ae963 
								
							 
						 
						
							
							
								
								Move Interrupted exception class out of Session  
							
							
							
						 
						
							2015-07-15 14:28:43 -07:00  
				
					
						
							
							
								 
						
							
								854e603f84 
								
							 
						 
						
							
							
								
								Add new testdirs ini option  
							
							... 
							
							
							
							Fix  #694  
						
							2015-07-10 21:52:47 -03:00  
				
					
						
							
							
								 
						
							
								8664fc4102 
								
							 
						 
						
							
							
								
								Add a --noconftest option.  
							
							
							
						 
						
							2015-06-23 09:38:54 +02:00  
				
					
						
							
							
								 
						
							
								bddc88f09e 
								
							 
						 
						
							
							
								
								adapt to pluggy naming, rename pytest.hookspec_opts to pytest.hookspec,s ame with hookimpl_opts  
							
							... 
							
							
							
							--HG--
branch : pluggy1 
							
						 
						
							2015-05-06 10:08:08 +02:00