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

fix #3498 - correctly consider marks on unittest classes #3500

Merged

Conversation

RonnyPfannschmidt
Copy link
Member

@RonnyPfannschmidt RonnyPfannschmidt commented May 24, 2018

Thanks for submitting a PR, your contribution is really appreciated!

Here's a quick checklist that should be present in PRs (you can delete this text from the final description, this is
just a guideline):

  • Create a new changelog file in the changelog folder, with a name like <ISSUE NUMBER>.<TYPE>.rst. See changelog/README.rst for details.
  • Target the master branch for bug fixes, documentation updates and trivial changes.
  • Target the features branch for new features and removals/deprecations.
  • Include documentation when adding new features.
  • Include new tests or update existing tests when applicable.

Unless your change is trivial or a small documentation fix (e.g., a typo or reword of a small section) please:

  • Add yourself to AUTHORS in alphabetical order;

@RonnyPfannschmidt RonnyPfannschmidt changed the title [WIP] fix #3498 - correctly consider marks on unittest classes fix #3498 - correctly consider marks on unittest classes May 24, 2018
@coveralls
Copy link

coveralls commented May 24, 2018

Coverage Status

Coverage increased (+0.05%) to 92.742% when pulling bc25d51 on RonnyPfannschmidt:fix-3498-unittest-marks into afde9f0 on pytest-dev:master.

@pytest.mark.parametrize("base", [
'six.moves.builtins.object',
'unittest.TestCase',
'unittest2.TestCase',
Copy link
Member

Choose a reason for hiding this comment

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

We never install unittest2, should we add it to our testing dependencies in tox.ini?

Copy link
Member Author

Choose a reason for hiding this comment

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

atm i dont think thats necessary

@owenleonard
Copy link

I pulled down the changes and verified they work correctly for my use cases. Thanks for such a quick response!

@nicoddemus nicoddemus merged commit 48215fd into pytest-dev:master May 24, 2018
@nicoddemus
Copy link
Member

Thanks @RonnyPfannschmidt!

We should have a 3.6.1 release soon

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