983a09a2d4 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into merge-master-into-features  
							
							
							
						 
						
							2017-11-10 18:33:02 -02:00  
				
					
						
							
							
								 
						
							
								b11640c1eb 
								
							 
						 
						
							
							
								
								Fix linting E722: do not use bare except  
							
							
							
						 
						
							2017-11-04 13:59:10 -02:00  
				
					
						
							
							
								 
						
							
								03829fde8a 
								
							 
						 
						
							
							
								
								Fix linting E741: ambiguous variable name  
							
							
							
						 
						
							2017-11-04 13:59:10 -02:00  
				
					
						
							
							
								 
						
							
								9ad2b75038 
								
							 
						 
						
							
							
								
								skipping: replace _evalskip with a more consistent _skipped_by_mark  
							
							
							
						 
						
							2017-10-06 10:44:49 +02:00  
				
					
						
							
							
								 
						
							
								a33650953a 
								
							 
						 
						
							
							
								
								remove unused import  
							
							
							
						 
						
							2017-10-06 10:44:49 +02:00  
				
					
						
							
							
								 
						
							
								667e70f555 
								
							 
						 
						
							
							
								
								switch out the placeholder MarkEvaluator in unittest plugin  
							
							
							
						 
						
							2017-10-06 10:44:49 +02:00  
				
					
						
							
							
								 
						
							
								06a49338b2 
								
							 
						 
						
							
							
								
								make Test Outcomes inherit from BaseException instead of exception  
							
							... 
							
							
							
							fixes  #580  
						
							2017-07-28 15:28:51 +02:00  
				
					
						
							
							
								 
						
							
								1c935db571 
								
							 
						 
						
							
							
								
								Fixed E129 flake8 errors  
							
							... 
							
							
							
							visually indented line with same indent as next logical line 
							
						 
						
							2017-07-17 01:28:16 +02:00  
				
					
						
							
							
								 
						
							
								cf97159009 
								
							 
						 
						
							
							
								
								Fixed E128 flake8 errors  
							
							... 
							
							
							
							continuation line under-indented for visual indent 
							
						 
						
							2017-07-17 01:28:16 +02:00  
				
					
						
							
							
								 
						
							
								92e2cd9c68 
								
							 
						 
						
							
							
								
								Fixed E125 flake8 errors  
							
							... 
							
							
							
							continuation line with same indent as next logical line 
							
						 
						
							2017-07-17 01:28:16 +02:00  
				
					
						
							
							
								 
						
							
								efe03400d8 
								
							 
						 
						
							
							
								
								fixup nose/pytest plugins  
							
							
							
						 
						
							2017-03-28 11:45:06 +02: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  
				
					
						
							
							
								 
						
							
								ede4e9171f 
								
							 
						 
						
							
							
								
								Spelling fixes  
							
							
							
						 
						
							2017-02-15 17:00:58 +02:00  
				
					
						
							
							
								 
						
							
								ad56cd8027 
								
							 
						 
						
							
							
								
								extract a _handle_skip method, secure PY2 branch  
							
							
							
						 
						
							2017-02-02 05:01:51 +01:00  
				
					
						
							
							
								 
						
							
								36b6f17727 
								
							 
						 
						
							
							
								
								fixing code-style, keep flake8 happy  
							
							
							
						 
						
							2017-01-31 21:03:49 +01:00  
				
					
						
							
							
								 
						
							
								d1c725078a 
								
							 
						 
						
							
							
								
								Allow to skip unittests if --pdb active  
							
							... 
							
							
							
							closes  #2137  
						
							2017-01-31 04:47:31 +01: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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								696a9112be 
								
							 
						 
						
							
							
								
								integrating review commets of @nicoddemus  
							
							... 
							
							
							
							plus small scale refactoring 
							
						 
						
							2016-08-31 22:33:47 +02:00  
				
					
						
							
							
								 
						
							
								4eeb475138 
								
							 
						 
						
							
							
								
								avoid tearDown and cleanup for unittest debugging  
							
							
							
						 
						
							2016-08-30 21:55:49 +02:00  
				
					
						
							
							
								 
						
							
								d4c9fa9f1a 
								
							 
						 
						
							
							
								
								unittest.UnitTestCase: Allow __test__ for methods  
							
							... 
							
							
							
							__test__ needs to be checked for methods of a class too. Earlier,
this was not done, and all methods in a class was assumed to be
a test. This commit adds the appropriate condition to ensure that
if the __test__ is set to False, it does not collect that method.
Fixes https://github.com/pytest-dev/pytest/issues/1558  
							
						 
						
							2016-05-19 08:19:57 +05:30  
				
					
						
							
							
								 
						
							
								a912d3745b 
								
							 
						 
						
							
							
								
								Moved py.code code over to py.test  
							
							... 
							
							
							
							Fix  #103  
						
							2016-01-25 23:18:04 -02:00  
				
					
						
							
							
								 
						
							
								7b13c4bec0 
								
							 
						 
						
							
							
								
								Fix flakes  
							
							
							
						 
						
							2016-01-14 21:01:57 -02:00  
				
					
						
							
							
								 
						
							
								7d6edb9ca5 
								
							 
						 
						
							
							
								
								Fix unittest.skip decorator test and separate the fix into a different, self-doc function  
							
							
							
						 
						
							2015-11-04 19:54:18 -02:00  
				
					
						
							
							
								 
						
							
								313050b15b 
								
							 
						 
						
							
							
								
								Suggested edits by Bruno.  
							
							... 
							
							
							
							Moved fix to TestCaseFunction.setup. Added myself to AUTHORS and added entry to CHANGELOG 
							
						 
						
							2015-11-04 15:30:16 -05:00  
				
					
						
							
							
								 
						
							
								8de2c035e2 
								
							 
						 
						
							
							
								
								Fixes   #1169  
							
							... 
							
							
							
							The unittest.skip decorator runs @functools.wraps on self._testcase. functools.wraps expects a "__name__" attribute and this patch adds one. It might not be the correct fix, but it works for me. 
							
						 
						
							2015-11-04 13:52:40 -05:00  
				
					
						
							
							
								 
						
							
								13c01193d6 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/pytest-2.7'  
							
							
							
						 
						
							2015-06-19 10:03:37 +02:00  
				
					
						
							
							
								 
						
							
								f90b2f845c 
								
							 
						 
						
							
							
								
								unittest.SkipTest now reports original function location  
							
							... 
							
							
							
							Fix  #748  
						
							2015-06-18 22:27:43 -03: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  
				
					
						
							
							
								 
						
							
								d2a5c7f99b 
								
							 
						 
						
							
							
								
								add documented hookimpl_opts and hookspec_opts decorators  
							
							... 
							
							
							
							so that one doesn't have to use pytest.mark or function-attribute setting anymore
--HG--
branch : more_plugin 
							
						 
						
							2015-04-25 11:29:11 +02:00  
				
					
						
							
							
								 
						
							
								0253f7b8d5 
								
							 
						 
						
							
							
								
								remove all occurences of "__multicall__" on hook impls in pytest/*.  
							
							... 
							
							
							
							also simplify pytest_runtest_markereport hook in _pytest/skipping.py
while touching the code anyway. 
							
						 
						
							2014-10-08 20:23:40 +02:00  
				
					
						
							
							
								 
						
							
								97b671057d 
								
							 
						 
						
							
							
								
								put some imports back to function-level and streamline py2/py3 compat in one place  
							
							
							
						 
						
							2014-08-01 10:12:53 +02:00  
				
					
						
							
							
								 
						
							
								5603a0cd4b 
								
							 
						 
						
							
							
								
								Removing py.std usage from _pytest  
							
							
							
						 
						
							2014-07-31 19:13:40 -03:00  
				
					
						
							
							
								 
						
							
								494be731e3 
								
							 
						 
						
							
							
								
								support nose-style ``__test__`` attribute on modules, classes and  
							
							... 
							
							
							
							functions, including unittest-style Classes.  If set to True, the
test will not be collected.
--HG--
branch : nose_test_attr 
							
						 
						
							2014-04-10 12:46:27 +02:00  
				
					
						
							
							
								 
						
							
								b96d552dbd 
								
							 
						 
						
							
							
								
								no need for im_func and it does not exists in python3  
							
							
							
						 
						
							2014-03-27 23:57:18 -03:00  
				
					
						
							
							
								 
						
							
								eda8b02a8d 
								
							 
						 
						
							
							
								
								fix issue384 by removing the trial support code  
							
							
							
						 
						
							2013-11-19 10:58:24 +01:00  
				
					
						
							
							
								 
						
							
								05f6422392 
								
							 
						 
						
							
							
								
								remove unused imports (using "importchecker" project)  
							
							
							
						 
						
							2013-10-02 14:32:40 +02:00  
				
					
						
							
							
								 
						
							
								d565df90ad 
								
							 
						 
						
							
							
								
								fix issue333: fix a case of bad unittest/pytest hook interaction.  
							
							
							
						 
						
							2013-09-09 09:56:53 +02:00  
				
					
						
							
							
								 
						
							
								7d86827b5e 
								
							 
						 
						
							
							
								
								ref  #322  cleanup all teardown calling to only happen when setup succeeded.  
							
							... 
							
							
							
							don't use autouse fixtures for now because it would cause a proliferation
and overhead for the execution of every test.  Rather introduce a
node.addfinalizer(fin) to attach a finalizer to the respective node
and call it from node.setup() functions if the setup phase succeeded
(i.e. there is no setup function or it finished successfully) 
							
						 
						
							2013-08-02 09:52:40 +02:00  
				
					
						
							
							
								 
						
							
								b2ebb80878 
								
							 
						 
						
							
							
								
								fix issue322: tearDownClass is not run if setUpClass failed. Thanks  
							
							... 
							
							
							
							Mathieu Agopian for fixing.  The patch moves handling setUpClass
into a new autofixture. (XXX impl-decide if rather adding addfinalizer()
API to node's would have a similar effect) 
							
						 
						
							2013-08-02 00:02:28 +02:00  
				
					
						
							
							
								 
						
							
								7fc0d45a4c 
								
							 
						 
						
							
							
								
								refs  #322 : setUpClass and tearDownClass as autouse fixture and finalizer  
							
							
							
						 
						
							2013-08-01 23:48:40 +02:00  
				
					
						
							
							
								 
						
							
								7e831b66ec 
								
							 
						 
						
							
							
								
								fix issue148 - recognize @unittest.skip on classes, avoid setup/teardown  
							
							
							
						 
						
							2012-11-03 20:54:48 +01:00  
				
					
						
							
							
								 
						
							
								2637326782 
								
							 
						 
						
							
							
								
								improve support for trial a bit more: don't run trial's empty TestCase.runTest()  method  
							
							
							
						 
						
							2012-10-22 19:22:01 +02:00  
				
					
						
							
							
								 
						
							
								aa79c0a4b9 
								
							 
						 
						
							
							
								
								fix unittest emulation: TestCase.runTest is now ignored  
							
							... 
							
							
							
							if there are test* methods. 
							
						 
						
							2012-10-22 16:25:09 +02:00  
				
					
						
							
							
								 
						
							
								98513b995a 
								
							 
						 
						
							
							
								
								simplify/integrate fixturemapper into FixtureManager  
							
							... 
							
							
							
							also fix jstests test failures 
							
						 
						
							2012-10-17 11:20:45 +02:00  
				
					
						
							
							
								 
						
							
								cc2337af3a 
								
							 
						 
						
							
							
								
								refine parsefactories interface, fix two_classes test originally reported by Alex Okrushko, also add a few more tests to make sure autouse-fixtures are properly distinguished  
							
							
							
						 
						
							2012-10-16 16:13:12 +02:00  
				
					
						
							
							
								 
						
							
								2f3bbdafda 
								
							 
						 
						
							
							
								
								use fixturemapper/fixtureinfo from Function objects  
							
							
							
						 
						
							2012-10-16 13:48:00 +02:00  
				
					
						
							
							
								 
						
							
								021c087701 
								
							 
						 
						
							
							
								
								implement fixture information stored on the parentnode of functions  
							
							... 
							
							
							
							to be reused by metafunc mechanics and Function setup 
							
						 
						
							2012-10-16 13:47:59 +02:00  
				
					
						
							
							
								 
						
							
								d8c365ef2c 
								
							 
						 
						
							
							
								
								implement pytest.mark.usefixtures and ini-file usefixtures setting  
							
							... 
							
							
							
							and also refine fixture docs a bit - fixtures.txt should now mostly
reflect the current state of the implementation 
							
						 
						
							2012-10-05 19:20:40 +02:00  
				
					
						
							
							
								 
						
							
								bb07ba7807 
								
							 
						 
						
							
							
								
								rename a number of internal and externally visible variables to use the fixture name  
							
							... 
							
							
							
							rather than funcargs.  Introduce .funcargnames compatibility attribute for backward compat. 
							
						 
						
							2012-10-05 14:24:44 +02:00