From b97de57ebee298abbea76372de0f82c12f212215 Mon Sep 17 00:00:00 2001 From: holger krekel Date: Wed, 21 Nov 2012 10:13:44 +0100 Subject: [PATCH] improve docstring for metafunc.parametrize() --- CHANGELOG | 2 ++ _pytest/python.py | 7 +++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index c94497ef0..5bc829593 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -5,6 +5,8 @@ Changes between 2.3.4 and 2.3.5dev - move long description of distribution into README.rst +- improve docstring for metafunc.parametrize() + Changes between 2.3.3 and 2.3.4 ----------------------------------- diff --git a/_pytest/python.py b/_pytest/python.py index 4c1437c79..96eec73df 100644 --- a/_pytest/python.py +++ b/_pytest/python.py @@ -643,8 +643,11 @@ class Metafunc(FuncargnamesCompatAttr): :arg argnames: an argument name or a list of argument names - :arg argvalues: a list of values for the argname or a list of tuples of - values for the list of argument names. + :arg argvalues: The list of argvalues determines how often a test is invoked + with different argument values. If only one argname was specified argvalues + is a list of simple values. If N argnames were specified, argvalues must + be a list of N-tuples, where each tuple-element specifies a value for its + respective argname. :arg indirect: if True each argvalue corresponding to an argname will be passed as request.param to its respective argname fixture