Skip to content

Fixture split 2nd attempt #1710

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

Merged
merged 1 commit into from
Jul 10, 2016

Conversation

RonnyPfannschmidt
Copy link
Member

No description provided.

@coveralls
Copy link

coveralls commented Jul 9, 2016

Coverage Status

Coverage increased (+0.01%) to 92.157% when pulling 8c49561 on RonnyPfannschmidt:fixture-split into 7a2058e on pytest-dev:features.

@nicoddemus
Copy link
Member

I see this also fixes #1125

@RonnyPfannschmidt
Copy link
Member Author

oh, i didn't notice ^^ i'll need some more code moves tho

@nicoddemus
Copy link
Member

@RonnyPfannschmidt you think it is worth doing it now, since this PR is moving a lot of code around anyway? 😁

@RonnyPfannschmidt
Copy link
Member Author

doing a second one helped getting faster with it
i feel the need to do the split as a base for moving more around

but i wouldn't mind deferring should it turn necessary

@nicoddemus nicoddemus merged commit 6f68dfc into pytest-dev:features Jul 10, 2016
@nicoddemus
Copy link
Member

Oh my this completely broke my invocation-scope branch... I thought Git would keep track better of those things. 😭

@The-Compiler
Copy link
Member

@nicoddemus a git rebase features doesn't fix it with minimal/no conflicts?

@nicoddemus
Copy link
Member

Nope, that's what I meant with "broke my branch"... Git didn't track my changes at all :(

@nicoddemus
Copy link
Member

@RonnyPfannschmidt did you change anything or just moved code around? I'm getting a strange failure in doctest after trying to apply my changes into the new branch...

@RonnyPfannschmidt
Copy link
Member Author

i only moved code, please show the failure

@nicoddemus
Copy link
Member

No worries, I will try to figure it out tomorrow

@nicoddemus
Copy link
Member

Found the problem, by mistake I missed some lines when applying the patch. 😅

@RonnyPfannschmidt RonnyPfannschmidt deleted the fixture-split branch August 21, 2016 18:06
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.

4 participants