051db6a33d 
								
							 
						 
						
							
							
								
								Trimming Trailing Whitespace  
							
							
							
						 
						
							2018-08-08 18:18:18 -05:00  
				
					
						
							
							
								 
						
							
								aa358433b0 
								
							 
						 
						
							
							
								
								Fix AttributeError bug in TestCaseFunction.teardown by creating TestCaseFunction._testcase as attribute of class with a None default.  
							
							
							
						 
						
							2018-08-08 18:13:21 -05:00  
				
					
						
							
							
								 
						
							
								cbaa7dd56a 
								
							 
						 
						
							
							
								
								Upgrade pre-commit hooks except pyupgrade  
							
							
							
						 
						
							2018-06-26 06:35:27 -07:00  
				
					
						
							
							
								 
						
							
								1b16d649f9 
								
							 
						 
						
							
							
								
								Fix formatting of merged files  
							
							
							
						 
						
							2018-05-25 18:21:48 -03:00  
				
					
						
							
							
								 
						
							
								6f8547cc1a 
								
							 
						 
						
							
							
								
								Merge branch 'master' into pre-commit-hook  
							
							
							
						 
						
							2018-05-25 18:14:43 -03:00  
				
					
						
							
							
								 
						
							
								da2c2e8492 
								
							 
						 
						
							
							
								
								more debugging for  #3498  
							
							
							
						 
						
							2018-05-24 09:58:36 +02:00  
				
					
						
							
							
								 
						
							
								74cfdc5feb 
								
							 
						 
						
							
							
								
								add failing test for  #3498  
							
							
							
						 
						
							2018-05-24 07:30:38 +02:00  
				
					
						
							
							
								 
						
							
								703e4b11ba 
								
							 
						 
						
							
							
								
								run black  
							
							
							
						 
						
							2018-05-23 16:48:46 +02:00  
				
					
						
							
							
								 
						
							
								983a09a2d4 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into merge-master-into-features  
							
							
							
						 
						
							2017-11-10 18:33:02 -02:00  
				
					
						
							
							
								 
						
							
								03829fde8a 
								
							 
						 
						
							
							
								
								Fix linting E741: ambiguous variable name  
							
							
							
						 
						
							2017-11-04 13:59:10 -02:00  
				
					
						
							
							
								 
						
							
								ef732fc51d 
								
							 
						 
						
							
							
								
								Remove code for unsupported Python versions  
							
							
							
						 
						
							2017-10-10 08:54:56 +03:00  
				
					
						
							
							
								 
						
							
								3dc0da9339 
								
							 
						 
						
							
							
								
								Remove __multicall__ warning and usages in testing  
							
							... 
							
							
							
							pluggy>=0.5 already warns about those 
							
						 
						
							2017-09-01 18:53:06 -03:00  
				
					
						
							
							
								 
						
							
								bda07d8b27 
								
							 
						 
						
							
							
								
								Ignore socket warnings on windows for trial tests  
							
							
							
						 
						
							2017-07-22 21:44:18 -03:00  
				
					
						
							
							
								 
						
							
								0726d9a09f 
								
							 
						 
						
							
							
								
								Turn warnings into errors in pytest's own test suite  
							
							... 
							
							
							
							Fix  #2588  
						
							2017-07-22 21:44:18 -03:00  
				
					
						
							
							
								 
						
							
								b840622819 
								
							 
						 
						
							
							
								
								Fixed E302 flake8 errors  
							
							... 
							
							
							
							expected 2 blank lines, found 0 
							
						 
						
							2017-07-17 01:44:23 +02:00  
				
					
						
							
							
								 
						
							
								6146ac97d9 
								
							 
						 
						
							
							
								
								Fixed E101 flake8 errors  
							
							... 
							
							
							
							indentation contains mixed spaces and tabs 
							
						 
						
							2017-07-17 01:28:16 +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  
				
					
						
							
							
								 
						
							
								fb0b90646e 
								
							 
						 
						
							
							
								
								New-style classes implemented for python 2.7 -  #2147  
							
							
							
						 
						
							2017-02-16 20:28:17 +01: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  
				
					
						
							
							
								 
						
							
								3ba475c0f2 
								
							 
						 
						
							
							
								
								Move internal _is_unittest_unexpected_success_a_failure to "compat" module  
							
							... 
							
							
							
							Fix  #1815  
						
							2016-08-17 22:50:10 -03:00  
				
					
						
							
							
								 
						
							
								463e6572c5 
								
							 
						 
						
							
							
								
								Merge branch 'master' into merge-master-into-features  
							
							... 
							
							
							
							Preparing for 3.0 
							
						 
						
							2016-08-17 22:39:23 -03:00  
				
					
						
							
							
								 
						
							
								4ed412eb59 
								
							 
						 
						
							
							
								
								unittest's unexpectedSuccess should work as non-strict xpass  
							
							... 
							
							
							
							Make sure tests for that behavior obtain the same return code
using either pytest or unittest to run the same file 
							
						 
						
							2016-08-17 21:32:04 -03:00  
				
					
						
							
							
								 
						
							
								14a4dd0697 
								
							 
						 
						
							
							
								
								Extend test to verify longrepr in stdout  
							
							
							
						 
						
							2016-08-12 23:31:38 +01:00  
				
					
						
							
							
								 
						
							
								10a6ed1707 
								
							 
						 
						
							
							
								
								Update unittest test to expect failure for an unexpected success  
							
							
							
						 
						
							2016-08-12 23:18:02 +01:00  
				
					
						
							
							
								 
						
							
								458ecae1df 
								
							 
						 
						
							
							
								
								Replace all usages of "pytest_funcarg__" for @pytest.fixture  
							
							
							
						 
						
							2016-07-11 22:21:52 -03: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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								1833547936 
								
							 
						 
						
							
							
								
								Added test for issue  #1169  
							
							... 
							
							
							
							(I undid my fix, checked for failure, redid my fix and it passes) 
							
						 
						
							2015-11-04 14:24:22 -05:00  
				
					
						
							
							
								 
						
							
								2ffd37b816 
								
							 
						 
						
							
							
								
								return non-zero exit code if no tests are collected  
							
							... 
							
							
							
							Fix  #812 
Fix  #500  
						
							2015-08-18 07:35:02 -03:00  
				
					
						
							
							
								 
						
							
								df29120abe 
								
							 
						 
						
							
							
								
								Merge branch 'pytest-2.7'  
							
							... 
							
							
							
							Conflicts:
	_pytest/config.py
	_pytest/genscript.py
	_pytest/mark.py
	tox.ini 
							
						 
						
							2015-07-23 22:35:51 -03:00  
				
					
						
							
							
								 
						
							
								31cfbac1f4 
								
							 
						 
						
							
							
								
								Fix autouse fixtures defined in a TestCase subclass  
							
							
							
						 
						
							2015-07-20 19:28:54 -03: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  
				
					
						
							
							
								 
						
							
								894d7dca22 
								
							 
						 
						
							
							
								
								avoid undocumented special casing of "pytest_" prefix  
							
							... 
							
							
							
							--HG--
branch : plugin_no_pytest 
							
						 
						
							2015-04-22 13:44:37 +02:00  
				
					
						
							
							
								 
						
							
								2ba23e8d08 
								
							 
						 
						
							
							
								
								issue504: verbose output displays node IDs for each test  
							
							... 
							
							
							
							Replace the verbose per-test reporting format of `file:line test_name RESULT`
with the node ID of the test, i.e. `file@line::class::method[param] RESULT`.
This patch does not update the examples in the docs; @hpk42 has a script
to regenerate those.
--HG--
branch : issue504 
							
						 
						
							2014-04-14 17:42:02 -04:00  
				
					
						
							
							
								 
						
							
								2700a94d49 
								
							 
						 
						
							
							
								
								remove an old duplicate marker and use recent pytest mechanism for parametrization  
							
							
							
						 
						
							2013-11-21 14:40:14 +01:00  
				
					
						
							
							
								 
						
							
								82846777a7 
								
							 
						 
						
							
							
								
								add missing importorskip  
							
							
							
						 
						
							2013-11-19 12:21:47 +01:00  
				
					
						
							
							
								 
						
							
								eda8b02a8d 
								
							 
						 
						
							
							
								
								fix issue384 by removing the trial support code  
							
							
							
						 
						
							2013-11-19 10:58:24 +01:00  
				
					
						
							
							
								 
						
							
								8ac5af2896 
								
							 
						 
						
							
							
								
								fix flakes issues and make --flakes run part of tox runs  
							
							
							
						 
						
							2013-10-12 15:39:22 +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  
				
					
						
							
							
								 
						
							
								7fc0d45a4c 
								
							 
						 
						
							
							
								
								refs  #322 : setUpClass and tearDownClass as autouse fixture and finalizer  
							
							
							
						 
						
							2013-08-01 23:48:40 +02:00  
				
					
						
							
							
								 
						
							
								28b2859718 
								
							 
						 
						
							
							
								
								change how the test is called  
							
							
							
						 
						
							2013-06-22 09:42:31 -07:00  
				
					
						
							
							
								 
						
							
								5e77eb23eb 
								
							 
						 
						
							
							
								
								add test_unittest_style_setup_teardown()  
							
							... 
							
							
							
							to test setUpModule() and tearDownModule() 
							
						 
						
							2013-06-22 09:35:10 -07: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  
				
					
						
							
							
								 
						
							
								64544bee1a 
								
							 
						 
						
							
							
								
								fix trial tests  
							
							
							
						 
						
							2012-10-18 15:09:20 +02:00