Skip to content

tests: use unittest.mock with py34+#3967

Merged
blueyed merged 1 commit into
pytest-dev:masterfrom
blueyed:optional-mock
Sep 13, 2018
Merged

tests: use unittest.mock with py34+#3967
blueyed merged 1 commit into
pytest-dev:masterfrom
blueyed:optional-mock

Conversation

@blueyed

@blueyed blueyed commented Sep 11, 2018

Copy link
Copy Markdown
Contributor

Fixes #3965.

@codecov

codecov Bot commented Sep 11, 2018

Copy link
Copy Markdown

Codecov Report

Merging #3967 into master will increase coverage by 0.03%.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #3967      +/-   ##
==========================================
+ Coverage   94.48%   94.52%   +0.03%     
==========================================
  Files         107      107              
  Lines       23651    23654       +3     
  Branches     2349     2349              
==========================================
+ Hits        22347    22359      +12     
+ Misses        993      988       -5     
+ Partials      311      307       -4
Flag Coverage Δ
#doctesting 29.31% <ø> (+0.84%) ⬆️
#linux 94.39% <100%> (+0.03%) ⬆️
#nobyte 0% <ø> (ø) ⬆️
#numpy 28.23% <ø> (+0.08%) ⬆️
#pexpect 0% <ø> (ø) ⬆️
#pluggymaster ?
#py27 92.63% <60%> (+0.03%) ⬆️
#py34 92.11% <100%> (-0.04%) ⬇️
#py35 92.12% <100%> (-0.04%) ⬇️
#py36 92.7% <100%> (-0.03%) ⬇️
#py37 92.33% <100%> (-0.04%) ⬇️
#trial 31.29% <ø> (+0.06%) ⬆️
#windows 93.85% <100%> (+0.03%) ⬆️
#xdist 18.48% <ø> (+0.02%) ⬆️
Impacted Files Coverage Δ
testing/code/test_code.py 94.11% <100%> (+0.13%) ⬆️
testing/python/integration.py 91.48% <0%> (-2.13%) ⬇️
testing/test_mark.py 97.05% <0%> (+0.45%) ⬆️
src/_pytest/terminal.py 91.6% <0%> (+1.74%) ⬆️

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 2c90b3d...7537e94. Read the comment docs.

@coveralls

coveralls commented Sep 11, 2018

Copy link
Copy Markdown

Coverage Status

Coverage decreased (-0.05%) to 93.835% when pulling 7537e94 on blueyed:optional-mock into 2c90b3d on pytest-dev:master.

@blueyed

blueyed commented Sep 11, 2018

Copy link
Copy Markdown
Contributor Author

Meh, running into tox-dev/tox#706 now.

@blueyed

blueyed commented Sep 11, 2018

Copy link
Copy Markdown
Contributor Author

Squashed, should be good now - although the workaround is a bit unfortunate to have in the first place.

Fixes pytest-dev#3965.

Has to work around tox-dev/tox#706.

No coverage for pluggymaster builds is OK though anyway.
@blueyed blueyed merged commit 2cf2dc3 into pytest-dev:master Sep 13, 2018
@blueyed blueyed deleted the optional-mock branch September 13, 2018 05:36
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