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

Don't mark empty doctest files as skipped, fixes #1578 #1580

Merged

Conversation

graingert
Copy link
Member

No description provided.

@The-Compiler
Copy link
Member

I don't really understand the implications of the change, but it seems like it made a lot of tests fail 😉

@graingert
Copy link
Member Author

@The-Compiler yeah I know :p

@RonnyPfannschmidt
Copy link
Member

i think this is related to fixture support for docktests, @nicoddemus do you remember details by chance?

@graingert graingert force-pushed the fix-all-skipped-but-none-exist branch 3 times, most recently from 18a15c4 to 3aa6858 Compare June 1, 2016 16:26
items, reprec = testdir.inline_genitems(w)
assert len(items) == 1
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this looks like it was a test bug

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep!

@graingert graingert force-pushed the fix-all-skipped-but-none-exist branch from 3aa6858 to cd427a1 Compare June 1, 2016 16:44
@graingert
Copy link
Member Author

requires #1582 to pass

@coveralls
Copy link

Coverage Status

Coverage decreased (-0.002%) to 92.204% when pulling cd427a1 on graingert:fix-all-skipped-but-none-exist into 7305adf on pytest-dev:master.

@coveralls
Copy link

Coverage Status

Coverage decreased (-0.002%) to 92.204% when pulling 3aa6858 on graingert:fix-all-skipped-but-none-exist into 7305adf on pytest-dev:master.

@coveralls
Copy link

Coverage Status

Coverage decreased (-0.002%) to 92.204% when pulling 3aa6858 on graingert:fix-all-skipped-but-none-exist into 7305adf on pytest-dev:master.

@graingert graingert force-pushed the fix-all-skipped-but-none-exist branch from cd427a1 to 74862b8 Compare June 1, 2016 18:19
@coveralls
Copy link

Coverage Status

Coverage decreased (-0.002%) to 92.204% when pulling 74862b8 on graingert:fix-all-skipped-but-none-exist into 057007f on pytest-dev:master.

@nicoddemus
Copy link
Member

Looks good, it makes much more sense for DoctestTextfile to collect items instead of being an item itself. 😁

@nicoddemus
Copy link
Member

Only missing CHANGELOG and AUTHORS, but I will update those myself before merging (right after AppVeyor passes).

@graingert
Copy link
Member Author

AppVeyor is slooooooww

@nicoddemus
Copy link
Member

Yep, it doesn't have multiple jobs like Travis, so we wait. 😌

nicoddemus added a commit to nicoddemus/pytest that referenced this pull request Jun 1, 2016
@nicoddemus nicoddemus merged commit 74862b8 into pytest-dev:master Jun 1, 2016
@nicoddemus
Copy link
Member

Merged, thanks again @graingert!

(The AppVeyor failure was unrelated, will see to that in a separate PR)

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.

5 participants