1499778d5e 
								
							 
						 
						
							
							
								
								Errors in parametrize id functions now propagate the error instead of issuing a warning  
							
							... 
							
							
							
							Fix  #2169  
						
							2018-12-14 21:07:54 -02:00  
				
					
						
							
							
								 
						
							
								40b85d7ee8 
								
							 
						 
						
							
							
								
								Remove Metafunc.addcall  
							
							... 
							
							
							
							Fix  #3083  
						
							2018-12-01 16:41:59 -02:00  
				
					
						
							
							
								 
						
							
								1bba0a9714 
								
							 
						 
						
							
							
								
								Deprecate `raises(..., 'code(as_a_string)')` / `warns(..., 'code(as_a_string)')  
							
							
							
						 
						
							2018-11-29 09:34:51 -08:00  
				
					
						
							
							
								 
						
							
								e9b2475e29 
								
							 
						 
						
							
							
								
								Display actual test ids in `--collect-only`  
							
							
							
						 
						
							2018-11-25 09:33:18 -08:00  
				
					
						
							
							
								 
						
							
								95c6d591f7 
								
							 
						 
						
							
							
								
								Properly escape \r \n \t bytes  
							
							
							
						 
						
							2018-11-19 11:03:52 -08:00  
				
					
						
							
							
								 
						
							
								9ca0ab6e2b 
								
							 
						 
						
							
							
								
								Ensure printable manually-specified param(id=...)  
							
							
							
						 
						
							2018-11-19 11:03:52 -08:00  
				
					
						
							
							
								 
						
							
								3d92d5a659 
								
							 
						 
						
							
							
								
								Make sure parametrize ids are printable  
							
							
							
						 
						
							2018-11-19 11:03:52 -08:00  
				
					
						
							
							
								 
						
							
								dc20dedbc7 
								
							 
						 
						
							
							
								
								Change RemovedInPytest4Warnings to errors by default  
							
							... 
							
							
							
							To keep existing tests which emit RemovedInPytest4Warnings running, decided
to go with a command line option because:
* Is harder to integrate an ini option with tests which already use an ini file
* It also marks tests which need to be removed/updated in 4.1, when
  RemovedInPytest4Warning and related functionality are removed.
Fix  #3737  
							
						 
						
							2018-11-12 16:10:57 -02:00  
				
					
						
							
							
								 
						
							
								2368fbb63c 
								
							 
						 
						
							
							
								
								Apply reorder-python-imports to all files  
							
							
							
						 
						
							2018-10-25 00:01:29 -07:00  
				
					
						
							
							
								 
						
							
								5436e42990 
								
							 
						 
						
							
							
								
								Use pytest.fail(..., pytrace=False) when treating user errors  
							
							... 
							
							
							
							This prevents an enormous and often useless stack trace from showing
to end users.
Fix  #3867 
Fix  #2293  
							
						 
						
							2018-10-10 19:16:53 -03:00  
				
					
						
							
							
								 
						
							
								86a14d007d 
								
							 
						 
						
							
							
								
								Fix scope determination with indirect parameters  
							
							... 
							
							
							
							Fix  #3941  
						
							2018-09-14 21:33:59 -03:00  
				
					
						
							
							
								 
						
							
								a0ce9a4441 
								
							 
						 
						
							
							
								
								remove the legacy code about im_func and generalize using fix and compat.getimfunc  
							
							
							
						 
						
							2018-09-13 15:38:36 +02:00  
				
					
						
							
							
								 
						
							
								c00d934b21 
								
							 
						 
						
							
							
								
								Merge pull request  #3933  from nicoddemus/idval-hypothesis-flaky-3707  
							
							... 
							
							
							
							Use -n auto now that xdist behaves well in Travis and AppVeyor 
							
						 
						
							2018-09-06 15:15:55 -03:00  
				
					
						
							
							
								 
						
							
								5eb85efa14 
								
							 
						 
						
							
							
								
								Use -n auto now that xdist behaves well in Travis and AppVeyor  
							
							... 
							
							
							
							This hopefully fixes the flaky test_idval_hypothesis on AppVeyor
Fix  #3707  
							
						 
						
							2018-09-06 09:22:13 -03:00  
				
					
						
							
							
								 
						
							
								adc9ed85bc 
								
							 
						 
						
							
							
								
								Fix test_idval_hypothesis  
							
							
							
						 
						
							2018-09-04 18:49:20 -03:00  
				
					
						
							
							
								 
						
							
								5a52acaa92 
								
							 
						 
						
							
							
								
								Make config no longer optional in parametrize id functions  
							
							
							
						 
						
							2018-09-04 16:55:52 -03:00  
				
					
						
							
							
								 
						
							
								b42518acd5 
								
							 
						 
						
							
							
								
								Change std_warn to receive a single warning instance, addressed review suggestions  
							
							
							
						 
						
							2018-09-04 14:20:42 -03:00  
				
					
						
							
							
								 
						
							
								78ac7d99f5 
								
							 
						 
						
							
							
								
								Deprecate Config.warn and Node.warn, replaced by standard warnings  
							
							
							
						 
						
							2018-09-04 11:35:34 -03:00  
				
					
						
							
							
								 
						
							
								0c8dbdcd92 
								
							 
						 
						
							
							
								
								Fix existing tests now that we are using standard warnings  
							
							
							
						 
						
							2018-09-04 11:35:34 -03:00  
				
					
						
							
							
								 
						
							
								85482d575e 
								
							 
						 
						
							
							
								
								Replace Source with dedent where possible  
							
							
							
						 
						
							2018-08-23 09:06:17 -07:00  
				
					
						
							
							
								 
						
							
								0fc4a806e5 
								
							 
						 
						
							
							
								
								py.builtins._totext -> string literals or six.text_type  
							
							
							
						 
						
							2018-08-22 23:00:04 -07:00  
				
					
						
							
							
								 
						
							
								6e57d123bb 
								
							 
						 
						
							
							
								
								Mark test_idval_hypothesis as flaky on Windows ( #3707 )  
							
							
							
						 
						
							2018-07-26 19:58:42 -03:00  
				
					
						
							
							
								 
						
							
								cbaa7dd56a 
								
							 
						 
						
							
							
								
								Upgrade pre-commit hooks except pyupgrade  
							
							
							
						 
						
							2018-06-26 06:35:27 -07:00  
				
					
						
							
							
								 
						
							
								703e4b11ba 
								
							 
						 
						
							
							
								
								run black  
							
							
							
						 
						
							2018-05-23 16:48:46 +02:00  
				
					
						
							
							
								 
						
							
								9aacb4635e 
								
							 
						 
						
							
							
								
								run pyupgrade  
							
							
							
						 
						
							2018-05-23 16:45:09 +02:00  
				
					
						
							
							
								 
						
							
								674879976f 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into merge-master-into-features  
							
							
							
						 
						
							2018-05-18 12:30:08 -03:00  
				
					
						
							
							
								 
						
							
								94e62dfc50 
								
							 
						 
						
							
							
								
								Increase hypothesis deadline  
							
							... 
							
							
							
							The value is pretty close to the new default that will come out in
future hypothesis versions, which is generating a deprecation error
on CI.
Using a loose deadline because CI boxes are not reliable in how much
CPU power they have available 
							
						 
						
							2018-05-16 07:34:53 -03:00  
				
					
						
							
							
								 
						
							
								63368e07ea 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into merge-master-into-features  
							
							
							
						 
						
							2018-04-24 21:26:45 -03:00  
				
					
						
							
							
								 
						
							
								857098fe0f 
								
							 
						 
						
							
							
								
								added indicative error when parametrizing an argument with a default value  
							
							
							
						 
						
							2018-04-15 20:52:57 +03: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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								eb462582af 
								
							 
						 
						
							
							
								
								fix   #2675  - store marks correctly in callspecs  
							
							
							
						 
						
							2017-08-10 19:46:36 +02:00  
				
					
						
							
							
								 
						
							
								0726d9a09f 
								
							 
						 
						
							
							
								
								Turn warnings into errors in pytest's own test suite  
							
							... 
							
							
							
							Fix  #2588  
						
							2017-07-22 21:44:18 -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  
				
					
						
							
							
								 
						
							
								17a21d540b 
								
							 
						 
						
							
							
								
								Fixed E301 flake8 errors  
							
							... 
							
							
							
							expected 1 blank line, found 0 
							
						 
						
							2017-07-17 01:44:23 +02:00  
				
					
						
							
							
								 
						
							
								617e510b6e 
								
							 
						 
						
							
							
								
								Fixed E231 flake8 errors  
							
							... 
							
							
							
							missing whitespace after ‘,’, ‘;’, or ‘:’ 
							
						 
						
							2017-07-17 01:44:22 +02:00  
				
					
						
							
							
								 
						
							
								1ff54ba205 
								
							 
						 
						
							
							
								
								Fixed E201 flake8 errors  
							
							... 
							
							
							
							whitespace after ‘(‘ 
							
						 
						
							2017-07-17 01:28:17 +02:00  
				
					
						
							
							
								 
						
							
								cf97159009 
								
							 
						 
						
							
							
								
								Fixed E128 flake8 errors  
							
							... 
							
							
							
							continuation line under-indented for visual 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  
				
					
						
							
							
								 
						
							
								fa56114115 
								
							 
						 
						
							
							
								
								Clean up warnings generated by pytest's own suite  
							
							
							
						 
						
							2017-03-20 22:13:17 -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  
				
					
						
							
							
								 
						
							
								fb0b90646e 
								
							 
						 
						
							
							
								
								New-style classes implemented for python 2.7 -  #2147  
							
							
							
						 
						
							2017-02-16 20:28:17 +01:00  
				
					
						
							
							
								 
						
							
								0e58c3fa80 
								
							 
						 
						
							
							
								
								updates for PR review  #2198  
							
							
							
						 
						
							2017-01-21 16:47:49 +13:00  
				
					
						
							
							
								 
						
							
								c848d0a771 
								
							 
						 
						
							
							
								
								Pass parameter name to `make_parametrize_id` hook function  
							
							
							
						 
						
							2017-01-21 16:46:45 +13:00  
				
					
						
							
							
								 
						
							
								a9193a1531 
								
							 
						 
						
							
							
								
								No longer silently ignore errors in parametrize callable ids  
							
							
							
						 
						
							2017-01-02 17:26:17 -02: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  
				
					
						
							
							
								 
						
							
								6db2f315fa 
								
							 
						 
						
							
							
								
								Explain a bad scope value to the user  
							
							
							
						 
						
							2016-09-21 16:40:58 -04:00  
				
					
						
							
							
								 
						
							
								1e10de574d 
								
							 
						 
						
							
							
								
								The "ids" argument to "parametrize" again accepts unicode strings in Python 2  
							
							... 
							
							
							
							Fixes  #1905  
						
							2016-09-02 18:38:15 -03:00  
				
					
						
							
							
								 
						
							
								972a5fb5d5 
								
							 
						 
						
							
							
								
								Improve error message when passing non-string ids to pytest.mark.parametrize  
							
							... 
							
							
							
							Fix  #1857  
						
							2016-08-23 23:31:45 -03:00  
				
					
						
							
							
								 
						
							
								df200297e2 
								
							 
						 
						
							
							
								
								Fix internal error when parametrizing using and empty list of ids()  
							
							... 
							
							
							
							Fix  #1849  
						
							2016-08-23 18:18:46 -03:00  
				
					
						
							
							
								 
						
							
								53a0e2b118 
								
							 
						 
						
							
							
								
								Fix code which guesses parametrized scope based on arguments  
							
							... 
							
							
							
							Fix  #1832  
						
							2016-08-22 21:05:41 -03:00  
				
					
						
							
							
								 
						
							
								463e6572c5 
								
							 
						 
						
							
							
								
								Merge branch 'master' into merge-master-into-features  
							
							... 
							
							
							
							Preparing for 3.0 
							
						 
						
							2016-08-17 22:39:23 -03:00  
				
					
						
							
							
								 
						
							
								dfc659f781 
								
							 
						 
						
							
							
								
								Fix sys.version_info expression in xfail marker  
							
							
							
						 
						
							2016-08-17 23:32:56 +01:00  
				
					
						
							
							
								 
						
							
								0173952961 
								
							 
						 
						
							
							
								
								Fix py3 xfail expression evaluation and parametrize strict  
							
							
							
						 
						
							2016-08-17 23:15:14 +01: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  
				
					
						
							
							
								 
						
							
								d72afe7e08 
								
							 
						 
						
							
							
								
								Fixed scope override inside metafunc.parametrize.  Fixes   #634  
							
							
							
						 
						
							2016-07-25 12:42:50 +02: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  
				
					
						
							
							
								 
						
							
								d000f2536a 
								
							 
						 
						
							
							
								
								added a test for when the indirect is just a string  
							
							
							
						 
						
							2016-07-24 10:47:06 +02:00  
				
					
						
							
							
								 
						
							
								f26fa5a441 
								
							 
						 
						
							
							
								
								changed error message for unused parametrize name  
							
							
							
						 
						
							2016-07-23 16:49:20 +02:00  
				
					
						
							
							
								 
						
							
								458ecae1df 
								
							 
						 
						
							
							
								
								Replace all usages of "pytest_funcarg__" for @pytest.fixture  
							
							
							
						 
						
							2016-07-11 22:21:52 -03:00  
				
					
						
							
							
								 
						
							
								8c49561470 
								
							 
						 
						
							
							
								
								split most fixture related code into own plugin  
							
							
							
						 
						
							2016-07-09 20:36:00 +02:00  
				
					
						
							
							
								 
						
							
								b9a91dc112 
								
							 
						 
						
							
							
								
								merge from master to features  
							
							
							
						 
						
							2016-07-06 11:51:48 +02:00  
				
					
						
							
							
								 
						
							
								df9918eda3 
								
							 
						 
						
							
							
								
								issue1625, name getfuncargvalue to getfixturevalue  
							
							
							
						 
						
							2016-06-24 10:08:19 +02:00  
				
					
						
							
							
								 
						
							
								b5bd4d959d 
								
							 
						 
						
							
							
								
								merge master to features  
							
							
							
						 
						
							2016-06-01 08:13:26 +02:00  
				
					
						
							
							
								 
						
							
								d217b52508 
								
							 
						 
						
							
							
								
								fix   #510  by adding a describing skip marker on empty parameterize  
							
							
							
						 
						
							2016-05-30 14:34:38 +02:00  
				
					
						
							
							
								 
						
							
								9733127951 
								
							 
						 
						
							
							
								
								pytest_make_parametrize_id receive config object  
							
							
							
						 
						
							2016-04-26 10:23:57 +03:00  
				
					
						
							
							
								 
						
							
								b9faf78d51 
								
							 
						 
						
							
							
								
								Added test_pytest_make_parametrize_id  
							
							
							
						 
						
							2016-04-25 17:48:28 +03:00  
				
					
						
							
							
								 
						
							
								23a8e2b469 
								
							 
						 
						
							
							
								
								Add .hypothesis to .gitignore and try an older version of Hypothesis for 2.6  
							
							
							
						 
						
							2016-04-02 11:47:37 -04:00  
				
					
						
							
							
								 
						
							
								491b30c5d9 
								
							 
						 
						
							
							
								
								Add Hypothesis test for _idval and fix bug it found  
							
							
							
						 
						
							2016-04-01 22:45:44 -04:00  
				
					
						
							
							
								 
						
							
								9b438d56e8 
								
							 
						 
						
							
							
								
								Fix a test_unicode_idval_python2 (now test_unicode_idval) and associated string handling on Python 3  
							
							
							
						 
						
							2016-04-01 12:27:17 -04:00  
				
					
						
							
							
								 
						
							
								b8c15a0215 
								
							 
						 
						
							
							
								
								improved idmaker name selection in case of duplicate ids  
							
							
							
						 
						
							2016-03-23 00:20:58 +02:00  
				
					
						
							
							
								 
						
							
								4b0237c8ee 
								
							 
						 
						
							
							
								
								added test for unique names when recievieng identical ids in parametrize  
							
							
							
						 
						
							2016-03-19 21:42:47 +02:00  
				
					
						
							
							
								 
						
							
								877ca5a0bf 
								
							 
						 
						
							
							
								
								added test for None in paramtrized ids list  
							
							
							
						 
						
							2016-03-19 21:38:24 +02:00  
				
					
						
							
							
								 
						
							
								a8cfd54871 
								
							 
						 
						
							
							
								
								added test for None in idmaker  
							
							
							
						 
						
							2016-03-19 21:23:49 +02:00  
				
					
						
							
							
								 
						
							
								8ce32b0795 
								
							 
						 
						
							
							
								
								When a regex pattern contains bytes instead of a string use escape_encode to turn it into a string before further processing. Thanks @nicoddemus for the review and tips!  
							
							
							
						 
						
							2016-03-05 21:04:34 -05:00  
				
					
						
							
							
								 
						
							
								a912d3745b 
								
							 
						 
						
							
							
								
								Moved py.code code over to py.test  
							
							... 
							
							
							
							Fix  #103  
						
							2016-01-25 23:18:04 -02:00  
				
					
						
							
							
								 
						
							
								b64470443f 
								
							 
						 
						
							
							
								
								Fix SystemError when using unicode_escape on Python 3  
							
							... 
							
							
							
							Fix  #1087  
						
							2015-09-29 18:20:30 -03:00  
				
					
						
							
							
								 
						
							
								8633c4cefd 
								
							 
						 
						
							
							
								
								Fix encoding errors for parametrized tests with unicode parameters in py2  
							
							... 
							
							
							
							Fix  #1085  
						
							2015-09-29 17:57:49 -03:00  
				
					
						
							
							
								 
						
							
								e1063678f1 
								
							 
						 
						
							
							
								
								escape bytes when creating ids for parametrized values  
							
							
							
						 
						
							2015-09-22 23:18:09 -03:00  
				
					
						
							
							
								 
						
							
								7f71ce0ab2 
								
							 
						 
						
							
							
								
								Reorganize tests  
							
							
							
						 
						
							2015-09-16 16:52:37 -04:00  
				
					
						
							
							
								 
						
							
								9a84c9edb6 
								
							 
						 
						
							
							
								
								Add tests for argument formatting  
							
							
							
						 
						
							2015-09-16 11:02:48 -04:00  
				
					
						
							
							
								 
						
							
								b49bedcf0c 
								
							 
						 
						
							
							
								
								Merge branch 'master' of git://github.com/Elizaveta239/pytest into Elizaveta239-master  
							
							
							
						 
						
							2015-08-28 11:10:22 +10:00  
				
					
						
							
							
								 
						
							
								e67d66a5d4 
								
							 
						 
						
							
							
								
								Merge branch 'pytest-dev'  
							
							... 
							
							
							
							# Conflicts:
#	AUTHORS 
							
						 
						
							2015-08-24 22:55:11 +03:00  
				
					
						
							
							
								 
						
							
								06585f5bdd 
								
							 
						 
						
							
							
								
								Always report error about parametrize data that doesn't correspond to fixtures in test functions.  
							
							
							
						 
						
							2015-08-23 13:42:40 +03:00  
				
					
						
							
							
								 
						
							
								729b5e9b2f 
								
							 
						 
						
							
							
								
								Merge pull request  #923  from The-Compiler/parametrize-idfunc  
							
							... 
							
							
							
							Generate parametrize IDs for enum/re/class objects. 
							
						 
						
							2015-08-08 15:09:54 -03:00  
				
					
						
							
							
								 
						
							
								36b86af4b9 
								
							 
						 
						
							
							
								
								Added more test cases  
							
							
							
						 
						
							2015-08-08 19:20:09 +02:00  
				
					
						
							
							
								 
						
							
								40fa7b25c5 
								
							 
						 
						
							
							
								
								Merge branch 'master' of git://github.com/Elizaveta239/pytest into Elizaveta239-master  
							
							... 
							
							
							
							Fixed merge conflict in CHANGELOG 
							
						 
						
							2015-08-08 18:54:53 +02:00  
				
					
						
							
							
								 
						
							
								b59376bea4 
								
							 
						 
						
							
							
								
								Alert user about other parametrize spellings.  
							
							
							
						 
						
							2015-08-07 07:51:59 +02:00