Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[4.6] parametrized: ids: support generator/iterator #128

Merged
merged 3 commits into from
Nov 21, 2019
Merged

[4.6] parametrized: ids: support generator/iterator #128

merged 3 commits into from
Nov 21, 2019

Commits on Nov 21, 2019

  1. parametrized: ids: support generator/iterator 

    Fixes pytest-dev#759

- Adjust test_parametrized_ids_invalid_type, create list to convert tuples
  Ref: pytest-dev#1857 (comment)

- Changelog for int to str conversion
  Ref: pytest-dev#1857 (comment)

(cherry picked from commit 2c941b5)

Conflicts:
	src/_pytest/mark/structures.py
	src/_pytest/python.py
	testing/python/metafunc.py
    @blueyed
    blueyed committed Nov 21, 2019
    Configuration menu
    Copy the full SHA
    8b1455b View commit details
    Browse the repository at this point in the history

  2. fixup! parametrized: ids: support generator/iterator

    @blueyed
    blueyed committed Nov 21, 2019
    Configuration menu
    Copy the full SHA
    74e52d4 View commit details
    Browse the repository at this point in the history

  3. fixup! fixup! parametrized: ids: support generator/iterator

    @blueyed
    blueyed committed Nov 21, 2019
    Configuration menu
    Copy the full SHA
    bf0c434 View commit details
    Browse the repository at this point in the history