63368e07ea 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into merge-master-into-features  
							
							
							
						 
						
							2018-04-24 21:26:45 -03:00  
				
					
						
							
							
								 
						
							
								d483b401ee 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/features' into features  
							
							
							
						 
						
							2018-04-24 13:45:10 -07:00  
				
					
						
							
							
								 
						
							
								acacf75f49 
								
							 
						 
						
							
							
								
								Added another package-scoped fixture test.  
							
							... 
							
							
							
							Changed existing complex tests to use package fixtures. 
							
						 
						
							2018-04-24 13:32:58 -07:00  
				
					
						
							
							
								 
						
							
								132fb61eba 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/features' into ApaDoctor/disable-repeated-fixture  
							
							
							
						 
						
							2018-04-23 22:24:53 -03:00  
				
					
						
							
							
								 
						
							
								03850cf962 
								
							 
						 
						
							
							
								
								Add test for applying fixture twice  
							
							... 
							
							
							
							Fix  #2334  
						
							2018-04-23 22:17:46 -03:00  
				
					
						
							
							
								 
						
							
								7d923c389e 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/features' into features  
							
							
							
						 
						
							2018-04-18 00:11:03 -07:00  
				
					
						
							
							
								 
						
							
								c02e8d8b0d 
								
							 
						 
						
							
							
								
								Fix test collection when tests are passed as IDs at the command line. Note this is still broken due to  #3358 .  
							
							
							
						 
						
							2018-04-16 11:44:05 -07:00  
				
					
						
							
							
								 
						
							
								857098fe0f 
								
							 
						 
						
							
							
								
								added indicative error when parametrizing an argument with a default value  
							
							
							
						 
						
							2018-04-15 20:52:57 +03:00  
				
					
						
							
							
								 
						
							
								2b1410895e 
								
							 
						 
						
							
							
								
								Add package scoped fixtures  #2283  
							
							
							
						 
						
							2018-04-11 15:39:42 -07:00  
				
					
						
							
							
								 
						
							
								10a7160549 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into merge-master-into-features  
							
							
							
						 
						
							2018-04-11 18:07:47 -03:00  
				
					
						
							
							
								 
						
							
								ec2d8223cf 
								
							 
						 
						
							
							
								
								Fix issue  #3372  
							
							
							
						 
						
							2018-04-06 14:16:12 +02:00  
				
					
						
							
							
								 
						
							
								99015bfc86 
								
							 
						 
						
							
							
								
								fix most of metafunc tests by mocking  
							
							
							
						 
						
							2018-03-29 17:52:01 +02:00  
				
					
						
							
							
								 
						
							
								180ae09202 
								
							 
						 
						
							
							
								
								deprecate markinfo and fix up most marker scoping access while completely breaking metafunc testing  
							
							
							
						 
						
							2018-03-29 17:52:01 +02:00  
				
					
						
							
							
								 
						
							
								34afded06d 
								
							 
						 
						
							
							
								
								Update pytest.raises to raise a TypeError when an invalid keyword argument is passed.  
							
							
							
						 
						
							2018-03-27 19:57:15 -07:00  
				
					
						
							
							
								 
						
							
								59e7fd478e 
								
							 
						 
						
							
							
								
								Sort fixtures by scope when determining fixture closure  
							
							... 
							
							
							
							Fix  #2405  
						
							2018-03-20 20:10:53 -03:00  
				
					
						
							
							
								 
						
							
								9e24b09a9f 
								
							 
						 
						
							
							
								
								Use re_match_lines in test_class_ordering  
							
							... 
							
							
							
							"[1-a]" works fine using fnmatch_lines, but "[a-1]" breaks horribly
inside `re`. 
							
						 
						
							2018-03-20 20:10:52 -03:00  
				
					
						
							
							
								 
						
							
								161d4e5fe4 
								
							 
						 
						
							
							
								
								Add support for pytest.approx comparisons between scalar and array (inverted order)  
							
							
							
						 
						
							2018-03-14 16:29:04 -03:00  
				
					
						
							
							
								 
						
							
								c34dde7a3f 
								
							 
						 
						
							
							
								
								Add support for pytest.approx comparisons between array and scalar  
							
							
							
						 
						
							2018-03-14 15:47:21 -03:00  
				
					
						
							
							
								 
						
							
								bedceaacc4 
								
							 
						 
						
							
							
								
								Merge pull request  #3249  from a-feld/request-fixture-reference-cycle  
							
							... 
							
							
							
							Fix PseudoFixtureDef reference cycle. 
							
						 
						
							2018-02-22 19:23:56 -03:00  
				
					
						
							
							
								 
						
							
								aa53e37fa2 
								
							 
						 
						
							
							
								
								Add a test to expose leaked PseudoFixtureDef types.  
							
							
							
						 
						
							2018-02-21 22:42:44 -08:00  
				
					
						
							
							
								 
						
							
								6e14585ca2 
								
							 
						 
						
							
							
								
								Fix approx default tolerances for Decimal  
							
							
							
						 
						
							2018-02-21 23:08:23 +01:00  
				
					
						
							
							
								 
						
							
								b486e1294b 
								
							 
						 
						
							
							
								
								Merge pull request  #3222  from The-Compiler/match-msg  
							
							... 
							
							
							
							Remove "matching '...'" part from the pytest.raises message 
							
						 
						
							2018-02-17 21:18:05 -02:00  
				
					
						
							
							
								 
						
							
								3cbf0c8ec0 
								
							 
						 
						
							
							
								
								Raise unexpected exceptions with pytest.raises() using match=  
							
							
							
						 
						
							2018-02-15 12:11:56 +01:00  
				
					
						
							
							
								 
						
							
								b6166dccb4 
								
							 
						 
						
							
							
								
								Fix mock patchings detection when both mock and unittest.mock are present  
							
							
							
						 
						
							2018-02-12 20:29:37 +01:00  
				
					
						
							
							
								 
						
							
								4458e65fe7 
								
							 
						 
						
							
							
								
								Fix ordering of tests to minimize fixture creating  
							
							
							
						 
						
							2018-02-01 13:07:45 -08:00  
				
					
						
							
							
								 
						
							
								aff463a3c4 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into features  
							
							
							
						 
						
							2018-01-27 12:28:43 -02:00  
				
					
						
							
							
								 
						
							
								7f83605c81 
								
							 
						 
						
							
							
								
								fix empty parameterset tests by mocking a config object  
							
							
							
						 
						
							2018-01-26 11:10:00 +01:00  
				
					
						
							
							
								 
						
							
								af37778b0d 
								
							 
						 
						
							
							
								
								All classes now subclass object for better py3 compatibility  
							
							... 
							
							
							
							Fix  #2147  
						
							2018-01-24 18:23:42 -02:00  
				
					
						
							
							
								 
						
							
								bd1d17e8de 
								
							 
						 
						
							
							
								
								Replace py.std with stdlib imports  
							
							
							
						 
						
							2018-01-09 12:44:10 -08:00  
				
					
						
							
							
								 
						
							
								afc607cfd8 
								
							 
						 
						
							
							
								
								move node base classes from main to nodes  
							
							
							
						 
						
							2017-12-18 11:08:20 +01:00  
				
					
						
							
							
								 
						
							
								652936f47f 
								
							 
						 
						
							
							
								
								make linter happier  
							
							
							
						 
						
							2017-11-30 10:29:05 +00:00  
				
					
						
							
							
								 
						
							
								e66473853c 
								
							 
						 
						
							
							
								
								add test  
							
							
							
						 
						
							2017-11-30 10:19:29 +00:00  
				
					
						
							
							
								 
						
							
								dab889304e 
								
							 
						 
						
							
							
								
								Implement progress percentage reporting while running tests  
							
							... 
							
							
							
							Fix  #2657  
						
							2017-11-21 21:01:41 -02:00  
				
					
						
							
							
								 
						
							
								f074fd9ac6 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/features' into malinoff/fix-2124  
							
							
							
						 
						
							2017-11-12 11:16:08 -02:00  
				
					
						
							
							
								 
						
							
								6550b9911b 
								
							 
						 
						
							
							
								
								pytest_fixture_post_finalizer now receives a request argument  
							
							
							
						 
						
							2017-11-12 11:14:55 -02:00  
				
					
						
							
							
								 
						
							
								258031afe5 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into malinoff/fix-2124  
							
							
							
						 
						
							2017-11-12 10:34:47 -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  
				
					
						
							
							
								 
						
							
								d1aa553f73 
								
							 
						 
						
							
							
								
								add mocked integrationtest for the deprecationwarning of makeitem  
							
							
							
						 
						
							2017-10-30 19:49:14 +01:00  
				
					
						
							
							
								 
						
							
								f7387e45ea 
								
							 
						 
						
							
							
								
								Fix linting  
							
							
							
						 
						
							2017-10-19 21:50:15 -02:00  
				
					
						
							
							
								 
						
							
								3da28067f3 
								
							 
						 
						
							
							
								
								Replace introspection in compat.getfuncargnames() with inspect/funcsigs.signature  
							
							
							
						 
						
							2017-10-19 16:01:26 -07:00  
				
					
						
							
							
								 
						
							
								ef732fc51d 
								
							 
						 
						
							
							
								
								Remove code for unsupported Python versions  
							
							
							
						 
						
							2017-10-10 08:54:56 +03:00  
				
					
						
							
							
								 
						
							
								e7a4d3d8cf 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into features  
							
							
							
						 
						
							2017-10-04 17:28:34 -03:00  
				
					
						
							
							
								 
						
							
								2802135741 
								
							 
						 
						
							
							
								
								fix 'DoctestItem' object has no attribute '_fixtureinfo'  
							
							... 
							
							
							
							* doxtests don't seem to have this attribute, so nothing will be written in that case.
* tried to be a good boy scout and tidied up surrounding code a bit (comments, shadowed/unused names, removed random new lines, naming things) 
							
						 
						
							2017-09-19 12:41:12 +02:00  
				
					
						
							
							
								 
						
							
								afe7966683 
								
							 
						 
						
							
							
								
								Fix call to outcome.get_result now that outcome.result is deprecated  
							
							
							
						 
						
							2017-09-18 21:36:54 -03:00  
				
					
						
							
							
								 
						
							
								9273e11f21 
								
							 
						 
						
							
							
								
								Merge branch 'master' into features  
							
							
							
						 
						
							2017-09-07 13:59:10 -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  
				
					
						
							
							
								 
						
							
								a993add783 
								
							 
						 
						
							
							
								
								Allow tests declared as @staticmethod to use fixtures  
							
							... 
							
							
							
							Fix  #2699  
						
							2017-08-17 20:44:19 -03:00  
				
					
						
							
							
								 
						
							
								eb462582af 
								
							 
						 
						
							
							
								
								fix   #2675  - store marks correctly in callspecs  
							
							
							
						 
						
							2017-08-10 19:46:36 +02:00  
				
					
						
							
							
								 
						
							
								763c580a2a 
								
							 
						 
						
							
							
								
								Merge pull request  #2576  from maiksensi/feat/raise-not-implemented-for-lt-gt-in-approx  
							
							... 
							
							
							
							#2003  Change behavior of `approx.py` to only support `__eq__` comparison 
						
							2017-07-30 17:48:33 -03:00  
				
					
						
							
							
								 
						
							
								a546a612bd 
								
							 
						 
						
							
							
								
								Fix nondeterminism in fixture collection order  
							
							... 
							
							
							
							fixtures.reorder_items is non-deterministic because it reorders based
on iteration over an (unordered) set.  Change the code to use an
OrderedDict instead so that we get deterministic behaviour, fixes  #920 . 
							
						 
						
							2017-07-26 14:41:10 +01:00  
				
					
						
							
							
								 
						
							
								b39f957b88 
								
							 
						 
						
							
							
								
								Add test of issue  #920  
							
							
							
						 
						
							2017-07-26 14:38:38 +01:00  
				
					
						
							
							
								 
						
							
								80f4699572 
								
							 
						 
						
							
							
								
								approx raises TypeError in Python 2 for comparison operators other than != and ==  
							
							
							
						 
						
							2017-07-25 20:07:10 -03:00  
				
					
						
							
							
								 
						
							
								0726d9a09f 
								
							 
						 
						
							
							
								
								Turn warnings into errors in pytest's own test suite  
							
							... 
							
							
							
							Fix  #2588  
						
							2017-07-22 21:44:18 -03:00  
				
					
						
							
							
								 
						
							
								d44565f385 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into fix-flake8-errors  
							
							
							
						 
						
							2017-07-19 17:57:30 -03:00  
				
					
						
							
							
								 
						
							
								24da938321 
								
							 
						 
						
							
							
								
								Fix additional flake8 errors  
							
							
							
						 
						
							2017-07-19 17:42:21 -03:00  
				
					
						
							
							
								 
						
							
								c92760dca8 
								
							 
						 
						
							
							
								
								Merge branch 'fix-flake8-issues'  
							
							
							
						 
						
							2017-07-19 17:03:36 -03:00  
				
					
						
							
							
								 
						
							
								7b1870a94e 
								
							 
						 
						
							
							
								
								Fix flake8 in features branch  
							
							
							
						 
						
							2017-07-17 21:16:14 -03:00  
				
					
						
							
							
								 
						
							
								4fd92ef9ba 
								
							 
						 
						
							
							
								
								Merge branch 'fix-flake8-issues' into features  
							
							
							
						 
						
							2017-07-17 21:05:39 -03:00  
				
					
						
							
							
								 
						
							
								5ae59279f4 
								
							 
						 
						
							
							
								
								Fixed E704 flake8 errors  
							
							... 
							
							
							
							multiple statements on one line (def) 
							
						 
						
							2017-07-17 01:44:23 +02:00  
				
					
						
							
							
								 
						
							
								85141a419f 
								
							 
						 
						
							
							
								
								Fixed E701 flake8 errors  
							
							... 
							
							
							
							multiple statements on one line (colon) 
							
						 
						
							2017-07-17 01:44:23 +02:00  
				
					
						
							
							
								 
						
							
								7d2ceb7872 
								
							 
						 
						
							
							
								
								Fixed E501 flake8 errors  
							
							... 
							
							
							
							line too long (> 120 characters) 
							
						 
						
							2017-07-17 01:44:23 +02:00  
				
					
						
							
							
								 
						
							
								7248b759e8 
								
							 
						 
						
							
							
								
								Fixed E303 flake8 errors  
							
							... 
							
							
							
							too many blank lines (3) 
							
						 
						
							2017-07-17 01:44:23 +02:00  
				
					
						
							
							
								 
						
							
								b840622819 
								
							 
						 
						
							
							
								
								Fixed E302 flake8 errors  
							
							... 
							
							
							
							expected 2 blank lines, found 0 
							
						 
						
							2017-07-17 01:44:23 +02:00  
				
					
						
							
							
								 
						
							
								17a21d540b 
								
							 
						 
						
							
							
								
								Fixed E301 flake8 errors  
							
							... 
							
							
							
							expected 1 blank line, found 0 
							
						 
						
							2017-07-17 01:44:23 +02:00  
				
					
						
							
							
								 
						
							
								195a816522 
								
							 
						 
						
							
							
								
								Fixed E265 flake8 errors  
							
							... 
							
							
							
							block comment should start with ‘# ‘ 
							
						 
						
							2017-07-17 01:44:22 +02:00  
				
					
						
							
							
								 
						
							
								8f3eb6dfc7 
								
							 
						 
						
							
							
								
								Fixed E261 flake8 errors  
							
							... 
							
							
							
							at least two spaces before inline comment 
							
						 
						
							2017-07-17 01:44:22 +02:00  
				
					
						
							
							
								 
						
							
								617e510b6e 
								
							 
						 
						
							
							
								
								Fixed E231 flake8 errors  
							
							... 
							
							
							
							missing whitespace after ‘,’, ‘;’, or ‘:’ 
							
						 
						
							2017-07-17 01:44:22 +02:00  
				
					
						
							
							
								 
						
							
								2e8caefcab 
								
							 
						 
						
							
							
								
								Fixed E225 flake8 errors  
							
							... 
							
							
							
							missing whitespace around operator 
							
						 
						
							2017-07-17 01:44:22 +02:00  
				
					
						
							
							
								 
						
							
								1ff54ba205 
								
							 
						 
						
							
							
								
								Fixed E201 flake8 errors  
							
							... 
							
							
							
							whitespace after ‘(‘ 
							
						 
						
							2017-07-17 01:28:17 +02:00  
				
					
						
							
							
								 
						
							
								df54bf0db5 
								
							 
						 
						
							
							
								
								Fixed E131 flake8 errors  
							
							... 
							
							
							
							continuation line unaligned for hanging indent 
							
						 
						
							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  
				
					
						
							
							
								 
						
							
								57438f3efe 
								
							 
						 
						
							
							
								
								Fixed E127 flake8 errors  
							
							... 
							
							
							
							continuation line over-indented for visual indent 
							
						 
						
							2017-07-17 01:28:16 +02:00  
				
					
						
							
							
								 
						
							
								e855a79dd4 
								
							 
						 
						
							
							
								
								Fixed E126 flake8 errors  
							
							... 
							
							
							
							continuation line over-indented for hanging indent 
							
						 
						
							2017-07-17 01:28:16 +02:00  
				
					
						
							
							
								 
						
							
								051d76a63f 
								
							 
						 
						
							
							
								
								Fixed E124 flake8 errors  
							
							... 
							
							
							
							closing bracket does not match visual indentation 
							
						 
						
							2017-07-17 01:28:16 +02:00  
				
					
						
							
							
								 
						
							
								4b20b9d8d9 
								
							 
						 
						
							
							
								
								Fixed E123 flake8 errors  
							
							... 
							
							
							
							closing bracket does not match indentation of opening bracket’s line 
							
						 
						
							2017-07-17 01:28:16 +02:00  
				
					
						
							
							
								 
						
							
								425665cf25 
								
							 
						 
						
							
							
								
								Fixed E122 flake8 errors  
							
							... 
							
							
							
							continuation line missing indentation or outdented 
							
						 
						
							2017-07-17 01:28:16 +02:00  
				
					
						
							
							
								 
						
							
								0be97624b7 
								
							 
						 
						
							
							
								
								Fixed E121 flake8 errors  
							
							... 
							
							
							
							continuation line under-indented for hanging indent 
							
						 
						
							2017-07-17 01:28:16 +02:00  
				
					
						
							
							
								 
						
							
								6af2abdb53 
								
							 
						 
						
							
							
								
								Fixed flake8 warnings  
							
							... 
							
							
							
							W191 indentation contains tabs
W292 no newline at end of file
W293 blank line contains whitespace
W391 blank line at end of file 
							
						 
						
							2017-07-17 01:28:16 +02:00  
				
					
						
							
							
								 
						
							
								e5169a026a 
								
							 
						 
						
							
							
								
								#2574 : --fixtures, --fixtures-per-test keep indentation of docstring  
							
							
							
						 
						
							2017-07-15 13:33:11 +02:00  
				
					
						
							
							
								 
						
							
								ef62b86335 
								
							 
						 
						
							
							
								
								Merge pull request  #2492  from kalekundert/features  
							
							... 
							
							
							
							Add support for numpy arrays (and dicts) to approx. 
							
						 
						
							2017-07-06 11:46:51 +02:00  
				
					
						
							
							
								 
						
							
								8524a57075 
								
							 
						 
						
							
							
								
								Add "approx" to all the repr-strings.  
							
							
							
						 
						
							2017-07-03 22:44:37 -07:00  
				
					
						
							
							
								 
						
							
								9b9fede5be 
								
							 
						 
						
							
							
								
								allow staticmethods to be detected as test functions  
							
							... 
							
							
							
							Allow a class method decorated `@staticmethod` to be collected as a test
function (if it meets the usual criteria).
This feature will not work in Python 2.6 -- static methods will still be
ignored there. 
							
						 
						
							2017-06-29 07:44:36 -04:00  
				
					
						
							
							
								 
						
							
								50769557e8 
								
							 
						 
						
							
							
								
								Skip the numpy doctests.  
							
							... 
							
							
							
							They seem like more trouble that they're worth. 
							
						 
						
							2017-06-15 14:53:27 -07:00  
				
					
						
							
							
								 
						
							
								8badb47db6 
								
							 
						 
						
							
							
								
								Implement suggestions from code review.  
							
							... 
							
							
							
							- Avoid importing numpy unless necessary.
- Mention numpy arrays and dictionaries in the docs.
- Add numpy to the list of tox dependencies.
- Don't unnecessarily copy arrays or allocate empty space for them.
- Use code from compat.py rather than writing py2/3 versions of things
  myself.
- Avoid reimplementing __repr__ for built-in types.
- Add an option to consider NaN == NaN, because sometimes people use NaN
  to mean "missing data". 
							
						 
						
							2017-06-15 09:19:10 -07:00  
				
					
						
							
							
								 
						
							
								4e4ebbef5a 
								
							 
						 
						
							
							
								
								Improve test to ensure the expected function is re-raised  
							
							
							
						 
						
							2017-06-13 20:16:48 -03:00  
				
					
						
							
							
								 
						
							
								5a856b6e29 
								
							 
						 
						
							
							
								
								handle and reraise subrequest finalizer exceptions  
							
							
							
						 
						
							2017-06-12 21:26:42 -04:00  
				
					
						
							
							
								 
						
							
								9f3122fec6 
								
							 
						 
						
							
							
								
								Add support for numpy arrays (and dicts) to approx.  
							
							... 
							
							
							
							This fixes  #1994 .  It turned out to require a lot of refactoring because
subclassing numpy.ndarray was necessary to coerce python into calling
the right `__eq__` operator. 
							
						 
						
							2017-06-11 19:27:41 -07:00  
				
					
						
							
							
								 
						
							
								f3b359f5b8 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into merge-master-into-features  
							
							... 
							
							
							
							# Conflicts:
#	_pytest/capture.py
#	_pytest/compat.py
#	_pytest/python.py
#	testing/python/collect.py
#	testing/test_mark.py 
							
						 
						
							2017-05-03 19:04:53 -03:00  
				
					
						
							
							
								 
						
							
								dcefb287fc 
								
							 
						 
						
							
							
								
								Try not to assume a module's file extension is .py  
							
							
							
						 
						
							2017-04-19 12:26:56 -07:00  
				
					
						
							
							
								 
						
							
								58ac4faf0c 
								
							 
						 
						
							
							
								
								Fix exception formatting while importing test modules  
							
							... 
							
							
							
							Fix  #2336  
						
							2017-03-29 14:43:13 -03:00  
				
					
						
							
							
								 
						
							
								fa56114115 
								
							 
						 
						
							
							
								
								Clean up warnings generated by pytest's own suite  
							
							
							
						 
						
							2017-03-20 22:13:17 -03:00  
				
					
						
							
							
								 
						
							
								9f85584656 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/features' into integrate-pytest-warnings  
							
							
							
						 
						
							2017-03-20 19:59:05 -03:00  
				
					
						
							
							
								 
						
							
								e368fb4b29 
								
							 
						 
						
							
							
								
								implement pytest.param  
							
							... 
							
							
							
							this allows a clear addition of parameterization parameters that carry along marks
instead of nesting multiple mark objects and destroying the possibility of creating
function valued parameters,
it just folders everything together into one object carrfying parameters, and the marks. 
							
						 
						
							2017-03-17 16:53:43 +01:00  
				
					
						
							
							
								 
						
							
								e5021dc9dc 
								
							 
						 
						
							
							
								
								Replace py.builtin.print_() calls by builtin print() function  
							
							
							
						 
						
							2017-03-16 22:46:51 -03:00  
				
					
						
							
							
								 
						
							
								78194093af 
								
							 
						 
						
							
							
								
								Improve warning representation in terminal plugin and fix tests  
							
							
							
						 
						
							2017-03-16 21:57:32 -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  
				
					
						
							
							
								 
						
							
								fb0b90646e 
								
							 
						 
						
							
							
								
								New-style classes implemented for python 2.7 -  #2147  
							
							
							
						 
						
							2017-02-16 20:28:17 +01:00  
				
					
						
							
							
								 
						
							
								3a0a0c2df9 
								
							 
						 
						
							
							
								
								Ignore errors raised from descriptors when collecting fixtures  
							
							... 
							
							
							
							Descriptors (e.g. properties) such as in the added test case are
triggered during collection, executing arbitrary code which can raise.
Previously, such exceptions were propagated and failed the collection.
Now these exceptions are caught and the corresponding attributes are
silently ignored.
A better solution would be to completely skip access to all custom
descriptors, such that the offending code doesn't even trigger. However
I think this requires manually going through the instance and all of its
MRO for each and every attribute checking if it might be a proper
fixture before accessing it. So I took the easy route here.
In other words, putting something like this in your test class is still
a bad idea...:
    @property
    def innocent(self):
        os.system('rm -rf /')
Fixes  #2234 . 
							
						 
						
							2017-02-07 14:27:34 +02:00  
				
					
						
							
							
								 
						
							
								abbff681ba 
								
							 
						 
						
							
							
								
								Fix '{0}' format for py26  
							
							
							
						 
						
							2017-02-02 18:01:44 -02:00