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.

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

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

Merged
merged 3 commits into from
Nov 21, 2019

Conversation

blueyed
Copy link
Owner

@blueyed blueyed commented Nov 21, 2019

Fixes pytest-dev#759

(cherry picked from commit 2c941b5)

Conflicts:
src/_pytest/mark/structures.py
src/_pytest/python.py
testing/python/metafunc.py

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 merged commit cb40f69 into my-4.6-maintenance Nov 21, 2019
@blueyed blueyed deleted the 46-ids-iter branch November 21, 2019 03:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant