diff options
author | Ronny Pfannschmidt <opensource@ronnypfannschmidt.de> | 2017-12-18 17:48:41 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-12-18 17:48:41 +0100 |
commit | 2f8427bb4eb2ac4d4e4dfe0df2b9fc7aee1b68d7 (patch) | |
tree | 8d0313ca04c761e29fd9f811d29f424300f1e7fc | |
parent | 30729b7c3c4c00e80e9dd3837d17258517567da9 (diff) | |
parent | 70461d1eada70c24a4a511bf09ae670d22e899c8 (diff) | |
download | pytest-2f8427bb4eb2ac4d4e4dfe0df2b9fc7aee1b68d7.tar.gz |
Merge pull request #3043 from awbdallas/parameterize_documentation_fix
Parameterize documentation fix
-rw-r--r-- | changelog/3001.doc | 1 | ||||
-rw-r--r-- | doc/en/parametrize.rst | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/changelog/3001.doc b/changelog/3001.doc new file mode 100644 index 000000000..e9b4dbd52 --- /dev/null +++ b/changelog/3001.doc @@ -0,0 +1 @@ +Add clarifying note about behavior of multiple parametrized arguments diff --git a/doc/en/parametrize.rst b/doc/en/parametrize.rst index 7a4ac2e18..7bc37ae38 100644 --- a/doc/en/parametrize.rst +++ b/doc/en/parametrize.rst @@ -123,8 +123,8 @@ To get all combinations of multiple parametrized arguments you can stack def test_foo(x, y): pass -This will run the test with the arguments set to ``x=0/y=2``, ``x=0/y=3``, ``x=1/y=2`` and -``x=1/y=3``. +This will run the test with the arguments set to ``x=0/y=2``,``x=1/y=2``, +``x=0/y=3``, and ``x=1/y=3`` exhausting parameters in the order of the decorators. .. _`pytest_generate_tests`: |