Skip to content

fix #4649 - also transfer markers to keywordmapping#4655

Merged
nicoddemus merged 1 commit into
pytest-dev:masterfrom
RonnyPfannschmidt:fix-4649
Jan 19, 2019
Merged

fix #4649 - also transfer markers to keywordmapping#4655
nicoddemus merged 1 commit into
pytest-dev:masterfrom
RonnyPfannschmidt:fix-4649

Conversation

@RonnyPfannschmidt

Copy link
Copy Markdown
Member

which is distinct from nodekeywords

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 #4649 - also transfer markers to keywordmapping,... fix #4649 - also transfer markers to keywordmapping Jan 18, 2019
as it turns out it is distinct from nodekeywords and behaves completely different
@codecov

codecov Bot commented Jan 18, 2019

Copy link
Copy Markdown

Codecov Report

Merging #4655 into master will decrease coverage by 0.01%.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #4655      +/-   ##
==========================================
- Coverage   95.73%   95.72%   -0.02%     
==========================================
  Files         111      111              
  Lines       24783    24787       +4     
  Branches     2455     2454       -1     
==========================================
+ Hits        23727    23728       +1     
  Misses        747      747              
- Partials      309      312       +3
Flag Coverage Δ
#docs 29.52% <0%> (+0.07%) ⬆️
#doctesting 29.52% <0%> (+0.07%) ⬆️
#linting 29.52% <0%> (+0.07%) ⬆️
#linux 95.55% <100%> (-0.02%) ⬇️
#nobyte 92.33% <100%> (ø) ⬆️
#numpy 93.17% <100%> (ø) ⬆️
#pexpect 42.02% <37.5%> (ø) ⬆️
#py27 93.73% <100%> (ø) ⬆️
#py34 91.84% <100%> (+0.06%) ⬆️
#py35 91.88% <100%> (+0.06%) ⬆️
#py36 91.89% <100%> (+0.06%) ⬆️
#py37 93.89% <100%> (-0.02%) ⬇️
#trial 93.17% <100%> (ø) ⬆️
#windows 93.92% <100%> (ø) ⬆️
#xdist 93.76% <100%> (-0.02%) ⬇️
Impacted Files Coverage Δ
src/_pytest/mark/legacy.py 97.95% <100%> (-0.05%) ⬇️
testing/test_mark.py 99.06% <100%> (+0.01%) ⬆️
src/_pytest/cacheprovider.py 95.75% <0%> (-1.42%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 6154a5a...f28b834. Read the comment docs.

@nicoddemus nicoddemus merged commit 677a7d0 into pytest-dev:master Jan 19, 2019
@RonnyPfannschmidt RonnyPfannschmidt deleted the fix-4649 branch January 20, 2019 13:12
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.

2 participants