9f94e443ff 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/pytest-2.7'  
							
							... 
							
							
							
							Conflicts:
	testing/conftest.py 
							
						 
						
							2015-07-24 19:24:21 -03:00  
				
					
						
							
							
								 
						
							
								35bbcc39a2 
								
							 
						 
						
							
							
								
								Interpret strings to "plugins" arg in pytest.main() as module names  
							
							... 
							
							
							
							See #855  
							
						 
						
							2015-07-23 23:37:09 -03:00  
				
					
						
							
							
								 
						
							
								3c2fd833ca 
								
							 
						 
						
							
							
								
								Reintroduce get_plugin_manager() for backward-compatibility  
							
							... 
							
							
							
							PyCharm pytest runner depends on this function existing (see #787 ).
Added reference to get_plugin_manager() and PluginManager/PytestPluginManager to docs 
							
						 
						
							2015-06-25 00:48:47 -03:00  
				
					
						
							
							
								 
						
							
								db5649ec6a 
								
							 
						 
						
							
							
								
								streamline pytester API majorly:  
							
							... 
							
							
							
							- integrate conftest into pytester plugin
- introduce runpytest() to either call runpytest_inline (default) or
  runpytest_subprocess (python -m pytest)
- move testdir.inline_runsource1 to pdb tests
- strike some unneccessary methods.
- a new section "writing plugins" and some better pytester docs
--HG--
branch : testrefactor 
							
						 
						
							2015-04-28 11:54:53 +02:00  
				
					
						
							
							
								 
						
							
								a8afba054a 
								
							 
						 
						
							
							
								
								- refine lsof checking  
							
							... 
							
							
							
							- make runpytest() create an inline testing process instead of
  a subprocess one
--HG--
branch : testrefactor 
							
						 
						
							2015-04-28 11:54:46 +02:00  
				
					
						
							
							
								 
						
							
								15328c04eb 
								
							 
						 
						
							
							
								
								Handle inspect.getsourcelines failures in FixtureLookupError  
							
							... 
							
							
							
							Fixes  #553 
--HG--
branch : getsourcelines-error-issue-553-pytest2.7 
						
							2015-04-15 19:31:22 -03:00  
				
					
						
							
							
								 
						
							
								51cff6f106 
								
							 
						 
						
							
							
								
								fix issue486: better reporting and handling of early conftest loading failures  
							
							... 
							
							
							
							--HG--
branch : issue486 
							
						 
						
							2014-04-02 20:42:41 +02:00  
				
					
						
							
							
								 
						
							
								2e1f6c85f6 
								
							 
						 
						
							
							
								
								introduce resume/suspend functionality for FDCapture and SysCapture,  
							
							... 
							
							
							
							fixing problems with early bailouts (from argparse's parse() function e.g.)
that wrote to stdout. 
							
						 
						
							2014-04-01 14:19:58 +02:00  
				
					
						
							
							
								 
						
							
								2b8a54d5d9 
								
							 
						 
						
							
							
								
								refine skipif to use direct booleans, to help with flakes  
							
							
							
						 
						
							2014-01-29 11:46:36 +01:00  
				
					
						
							
							
								 
						
							
								97da43d909 
								
							 
						 
						
							
							
								
								merge from default  
							
							... 
							
							
							
							--HG--
branch : multi-usageerror 
							
						 
						
							2014-01-25 10:42:21 +01:00  
				
					
						
							
							
								 
						
							
								83620ced2e 
								
							 
						 
						
							
							
								
								trim trailing spaces  
							
							
							
						 
						
							2014-01-18 10:40:20 +01:00  
				
					
						
							
							
								 
						
							
								e118682db1 
								
							 
						 
						
							
							
								
								Added test for previous crash on failed import fix  
							
							... 
							
							
							
							Also, rewrote the fix a bit.
ref #383 . 
							
						 
						
							2013-11-15 14:03:57 -05:00  
				
					
						
							
							
								 
						
							
								8ac5af2896 
								
							 
						 
						
							
							
								
								fix flakes issues and make --flakes run part of tox runs  
							
							
							
						 
						
							2013-10-12 15:39:22 +02:00  
				
					
						
							
							
								 
						
							
								d226b2faf4 
								
							 
						 
						
							
							
								
								release announcement, bump version numbers, some test adapatations because of random win32 test failures.  
							
							
							
						 
						
							2013-10-01 12:37:11 +02:00  
				
					
						
							
							
								 
						
							
								2c7d00579b 
								
							 
						 
						
							
							
								
								bump version, some windows test fixes, prevent logging from raising exceptions at the end (finally), add py25 to tox.ini.  
							
							
							
						 
						
							2013-09-30 16:09:26 +02:00  
				
					
						
							
							
								 
						
							
								a930f44e60 
								
							 
						 
						
							
							
								
								introduce pluginmanager.ensure_teardown() which allows  
							
							
							
						 
						
							2013-09-28 22:23:00 +02:00  
				
					
						
							
							
								 
						
							
								cf37c477bb 
								
							 
						 
						
							
							
								
								output errors for all failures of specific collection  
							
							... 
							
							
							
							when issueing a command with many specific items to collect,
print all collect failures instead of just the first one
--HG--
branch : multi-usageerror 
							
						 
						
							2013-09-08 22:26:51 +02:00  
				
					
						
							
							
								 
						
							
								8f24e10571 
								
							 
						 
						
							
							
								
								add changelog entry for anthon's hynek-fication of options,  
							
							... 
							
							
							
							and change the docs and tests to use the new style. 
							
						 
						
							2013-08-01 17:32:19 +02:00  
				
					
						
							
							
								 
						
							
								712898cfe1 
								
							 
						 
						
							
							
								
								- add release announce  
							
							
							
						 
						
							2013-03-28 10:21:03 +01:00  
				
					
						
							
							
								 
						
							
								69ef750091 
								
							 
						 
						
							
							
								
								fix issue134 - print the collect errors that prevent running specified test items  
							
							
							
						 
						
							2013-02-14 12:21:42 +01:00  
				
					
						
							
							
								 
						
							
								5173647b4d 
								
							 
						 
						
							
							
								
								fixes to against python3.3  
							
							
							
						 
						
							2012-10-01 10:14:54 +02:00  
				
					
						
							
							
								 
						
							
								51d94a4a6e 
								
							 
						 
						
							
							
								
								use higher difference on timing  
							
							
							
						 
						
							2012-05-18 13:56:49 +02:00  
				
					
						
							
							
								 
						
							
								e18abfd013 
								
							 
						 
						
							
							
								
								fix issue143 - call unconfigure/sessionfinish always when  
							
							... 
							
							
							
							configure/sessionstart where called
use exitcode 4 (instead of 3 which signaled an internal error)
when an initial directory/file was not found 
							
						 
						
							2012-05-17 23:11:23 +02:00  
				
					
						
							
							
								 
						
							
								268c051eba 
								
							 
						 
						
							
							
								
								propogate current PYTHONPATH  
							
							
							
						 
						
							2011-12-19 12:02:07 -05:00  
				
					
						
							
							
								 
						
							
								bd296c796f 
								
							 
						 
						
							
							
								
								try to avoid timing/race condition  
							
							
							
						 
						
							2011-11-08 23:04:31 +00:00  
				
					
						
							
							
								 
						
							
								7144cec580 
								
							 
						 
						
							
							
								
								avoid race condition in test, fix doc link  
							
							
							
						 
						
							2011-11-08 22:06:57 +00:00  
				
					
						
							
							
								 
						
							
								99a1188287 
								
							 
						 
						
							
							
								
								simplify durations output, no percentage, no "remaining" bits  
							
							
							
						 
						
							2011-11-08 20:57:19 +00:00  
				
					
						
							
							
								 
						
							
								0b18b6094e 
								
							 
						 
						
							
							
								
								fix duration option in case of collection errors  
							
							
							
						 
						
							2011-11-08 19:00:25 +00:00  
				
					
						
							
							
								 
						
							
								a324826dfd 
								
							 
						 
						
							
							
								
								separate out the duration tests  
							
							
							
						 
						
							2011-11-08 18:12:16 +00:00  
				
					
						
							
							
								 
						
							
								29bf205f3a 
								
							 
						 
						
							
							
								
								make --durations also show the execution times of setup/teardown calls. This requires a slight incompatibility - pytest_runtest_logreport now sees setup/teardown reports even if the tests passed.  
							
							
							
						 
						
							2011-11-08 17:53:46 +00:00  
				
					
						
							
							
								 
						
							
								3b9fd3abd8 
								
							 
						 
						
							
							
								
								introduce --durations=N showing slowest test executions  
							
							
							
						 
						
							2011-11-08 17:20:56 +00:00  
				
					
						
							
							
								 
						
							
								a2f4a11301 
								
							 
						 
						
							
							
								
								refine lsof/FD leakage testing and rework test setup and some of pytest own tests.   Note that the actual diff to non-test code is small.  Also remove some redundant tests (introduced by a copy-paste-error apparently in test_mark.py).  
							
							
							
						 
						
							2011-11-07 18:08:41 +00:00  
				
					
						
							
							
								 
						
							
								5ae04397bd 
								
							 
						 
						
							
							
								
								proper tests for issue74, thanks Arfrever  
							
							
							
						 
						
							2011-10-26 23:59:22 +02:00  
				
					
						
							
							
								 
						
							
								2c230f910d 
								
							 
						 
						
							
							
								
								fix issue74 - propperly filter out missfit names in _tryconvertpyarg  
							
							
							
						 
						
							2011-10-26 22:40:08 +02:00  
				
					
						
							
							
								 
						
							
								d37af98db3 
								
							 
						 
						
							
							
								
								try to make test suite pass on jython 2.5.1 again  
							
							
							
						 
						
							2011-09-21 08:12:37 +02:00  
				
					
						
							
							
								 
						
							
								eaec527a60 
								
							 
						 
						
							
							
								
								relax error string matching  
							
							
							
						 
						
							2011-09-21 06:21:48 +02:00  
				
					
						
							
							
								 
						
							
								5c32421f2e 
								
							 
						 
						
							
							
								
								merge, bump version  
							
							
							
						 
						
							2011-09-12 08:57:35 +02:00  
				
					
						
							
							
								 
						
							
								2315de8321 
								
							 
						 
						
							
							
								
								Add FIXME.  
							
							
							
						 
						
							2011-09-05 22:01:50 +02:00  
				
					
						
							
							
								 
						
							
								25711a0879 
								
							 
						 
						
							
							
								
								Add acceptance test for new --pyargs behavior.  
							
							
							
						 
						
							2011-09-05 17:38:22 +02:00  
				
					
						
							
							
								 
						
							
								c426a67b0e 
								
							 
						 
						
							
							
								
								make test skipping more precise to fix a py32 test failure  
							
							
							
						 
						
							2011-08-18 22:52:02 +02:00  
				
					
						
							
							
								 
						
							
								2618e3640f 
								
							 
						 
						
							
							
								
								account for quotes in error messages  
							
							
							
						 
						
							2011-06-03 22:11:00 -05:00  
				
					
						
							
							
								 
						
							
								e3b2792677 
								
							 
						 
						
							
							
								
								fix issue49 - avoid confusing errors when initialization goes wrong  
							
							
							
						 
						
							2011-06-01 14:54:34 +02:00  
				
					
						
							
							
								 
						
							
								942ae47cd1 
								
							 
						 
						
							
							
								
								tentatively use internal list for cleanups at unconfigure time - this helps reporting with partially executed pytest_configure() hooks  
							
							
							
						 
						
							2011-04-17 12:20:13 +02:00  
				
					
						
							
							
								 
						
							
								06ca7090f9 
								
							 
						 
						
							
							
								
								fix issue38 - nicer tracebacks on sessionstart/configure (and other internal/custom hook failures)  
							
							
							
						 
						
							2011-04-17 12:20:11 +02:00  
				
					
						
							
							
								 
						
							
								c552b58dc5 
								
							 
						 
						
							
							
								
								fix issue27 - --collectonly and -k keyword selection now work together.  
							
							... 
							
							
							
							internally, collectonly and terminal reporting has been unified. 
							
						 
						
							2011-03-06 18:32:00 +01:00  
				
					
						
							
							
								 
						
							
								3004fe3915 
								
							 
						 
						
							
							
								
								fix the last committed laxation of a test  
							
							
							
						 
						
							2011-02-04 23:20:27 +01:00  
				
					
						
							
							
								 
						
							
								eb225456d7 
								
							 
						 
						
							
							
								
								laxer test for also passing it with pypy  
							
							
							
						 
						
							2011-02-04 22:51:05 +01:00  
				
					
						
							
							
								 
						
							
								762ea71f67 
								
							 
						 
						
							
							
								
								fix error reporting issue when a "pyc" file has no relating "py"  
							
							
							
						 
						
							2011-01-27 21:11:21 +01:00  
				
					
						
							
							
								 
						
							
								821f493378 
								
							 
						 
						
							
							
								
								check docstring at test time instead of runtime, improve and test warning on assertion turned off (thanks FND for reporting)  
							
							
							
						 
						
							2010-12-09 11:00:31 +01:00  
				
					
						
							
							
								 
						
							
								c7531705fc 
								
							 
						 
						
							
							
								
								refine plugin registration, allow new "-p no:NAME" way to prevent/undo plugin registration  
							
							
							
						 
						
							2010-12-06 16:54:42 +01:00