Skip to content

Fix 3605 #3606

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 4 commits into from
Jun 27, 2018
Merged

Fix 3605 #3606

merged 4 commits into from
Jun 27, 2018

Conversation

RonnyPfannschmidt
Copy link
Member

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;

@coveralls
Copy link

Coverage Status

Coverage increased (+0.05%) to 92.694% when pulling 2c50f4c on RonnyPfannschmidt:fix-3605 into e86fe38 on pytest-dev:master.

@@ -0,0 +1 @@
unpack marks from parameterization to prevent the markdecorator missmatch bug.
Copy link
Member

Choose a reason for hiding this comment

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

How can we phrase this in a way that end users (that don't know the internals) can understand? 🤔

return normalize_mark_list(mark_list)


def normalize_mark_list(mark_list):
Copy link
Member

Choose a reason for hiding this comment

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

Please add a docstring here explaining why this is needed

@nicoddemus
Copy link
Member

nicoddemus commented Jun 21, 2018

btw, I don't think GitHub looks at the title of the PR to automatically close issues:

You can include keywords in your pull request descriptions, as well as commit messages, to automatically close issues in GitHub.

https://help.github.com/articles/closing-issues-using-keywords/

😉

edit: I just noticed that your last commit does include "fix " so this is of course fine. 😁

@nicoddemus nicoddemus merged commit ef1b91b into pytest-dev:master Jun 27, 2018
@RonnyPfannschmidt RonnyPfannschmidt deleted the fix-3605 branch August 2, 2018 10:31
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.

3 participants