Skip to content

Merge master into features#5339

Merged
nicoddemus merged 11 commits into
pytest-dev:featuresfrom
blueyed:merge-master-into-features
May 30, 2019
Merged

Merge master into features#5339
nicoddemus merged 11 commits into
pytest-dev:featuresfrom
blueyed:merge-master-into-features

Conversation

@blueyed

@blueyed blueyed commented May 30, 2019

Copy link
Copy Markdown
Contributor

Sorry, again for #5306.

@codecov

codecov Bot commented May 30, 2019

Copy link
Copy Markdown

Codecov Report

Merging #5339 into features will decrease coverage by 2.48%.
The diff coverage is 100%.

Impacted file tree graph

@@             Coverage Diff              @@
##           features    #5339      +/-   ##
============================================
- Coverage      92.4%   89.92%   -2.49%     
============================================
  Files           115      115              
  Lines         26294    26455     +161     
  Branches       2597     2631      +34     
============================================
- Hits          24297    23789     -508     
- Misses         1677     2330     +653     
- Partials        320      336      +16
Impacted Files Coverage Δ
src/_pytest/cacheprovider.py 97.87% <100%> (+0.02%) ⬆️
testing/test_pdb.py 97.79% <100%> (+50.24%) ⬆️
testing/test_cacheprovider.py 99.74% <100%> (ø) ⬆️
testing/test_reports.py 10.49% <0%> (-89.51%) ⬇️
testing/test_session.py 17.72% <0%> (-82.28%) ⬇️
testing/test_runner_xunit.py 29.82% <0%> (-70.18%) ⬇️
testing/test_runner.py 34.7% <0%> (-61.61%) ⬇️
testing/test_resultlog.py 53.6% <0%> (-46.4%) ⬇️
testing/test_pytester.py 54.04% <0%> (-34.98%) ⬇️
src/_pytest/reports.py 68.96% <0%> (-26.11%) ⬇️
... and 19 more

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 b10f289...6765aca. Read the comment docs.

@blueyed

blueyed commented May 30, 2019

Copy link
Copy Markdown
Contributor Author

Hmm, pypy3 did not fail here - restarted it. /cc @nicoddemus

@nicoddemus

Copy link
Copy Markdown
Member

Working again... do we see those failures on features by any chance?

@blueyed

blueyed commented May 30, 2019

Copy link
Copy Markdown
Contributor Author

Working again... do we see those failures on features by any chance?

What do you mean?

Can we merge this?

@nicoddemus

Copy link
Copy Markdown
Member

Working again... do we see those failures on features by any chance?
What do you mean?

I mean't pypy3, sorry.

Can we merge this?

Oops sure

@nicoddemus nicoddemus merged commit fbd8ff9 into pytest-dev:features May 30, 2019
@blueyed blueyed deleted the merge-master-into-features branch May 30, 2019 15:35
@blueyed

blueyed commented May 30, 2019

Copy link
Copy Markdown
Contributor Author

Re pypy3: it's been an issue on features, not master.

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