Skip to content

Merge master into features #6111

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
Merged
merged 12 commits into from
Nov 7, 2019
Merged

Merge master into features #6111

merged 12 commits into from
Nov 7, 2019
+79 −36

Conversation

@blueyed
Copy link
Contributor

@blueyed blueyed commented Nov 1, 2019

No description provided.

davidszotten and others added 2 commits October 31, 2019 21:41
@davidszotten @RonnyPfannschmidt @blueyed
Fix --trace for parametrized tests
285524c 
Without this, the second time it tries to stop in a parametrized
function it raises instead:

`ValueError: --trace can't be used with a fixture named func!`

Implementation idea, test (and changelog tweaks) thanks to blueyed

Co-Authored-By: Ronny Pfannschmidt <[email protected]>
Co-Authored-By: Daniel Hahler <[email protected]>
@blueyed
Merge pull request pytest-dev#6099 from davidszotten/trace_parametrize
dc5a4fb 
Fix --trace for parametrized tests
@blueyed blueyed changed the base branch from master to features November 1, 2019 04:08
@blueyed blueyed closed this Nov 1, 2019
@blueyed blueyed deleted the merge-master-into-features branch November 1, 2019 11:40
@blueyed blueyed restored the merge-master-into-features branch November 6, 2019 13:20
@blueyed blueyed reopened this Nov 6, 2019
@blueyed
Merge master into features
4e45472 
Conflicts:
	src/_pytest/debugging.py
@blueyed blueyed force-pushed the merge-master-into-features branch from 0d40727 to 4e45472 Compare November 6, 2019 13:22
@nicoddemus
Copy link
Member

nicoddemus commented Nov 6, 2019

Probably better to start over. 👍

@blueyed
Copy link
Contributor Author

blueyed commented Nov 6, 2019 •
edited
Loading

I've updated it.
Fails because of colors.
I've only want to have the py38 check really, but is not strictly necessary.
#6121 would help here (I've done that in my fork).

But of course I can also just update the test.

@blueyed blueyed merged commit b268463 into pytest-dev:features Nov 7, 2019
@blueyed blueyed deleted the merge-master-into-features branch November 7, 2019 11:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@blueyed @nicoddemus @davidszotten @gaucheph @The-Compiler