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

Merge master into features #3884

Merged
merged 89 commits into from
Aug 26, 2018

Conversation

nicoddemus
Copy link
Member

No description provided.

turturica and others added 30 commits August 9, 2018 18:06
… when suspending - solves bug but still missing tests), reorganized functions and context managers.
Use more flexible `language_version: python3`
Fixtures during teardown can use capsys and capfd to get output from tests
Add a check before printing teardown logs.

'print_teardown_sections' method does not check '--show-capture' option
value, and teardown logs are always printed.

Resolves: pytest-dev#3816
…li-logging

Bugfix/capsys with cli logging (again)
The problem was that _matchnodes would receive two items: [DoctestModule, Module]. It would then collect the first one, *cache it*, and fail to match against the name in the command line. Next, it would reuse the cached item (DoctestModule) instead of collecting the Module which would eventually find the "test" name on it.

Added the type of the node to the cache key to avoid this problem, although I'm not a big fan of caches that have different key types.

Fix pytest-dev#3843
Fix '--show-capture=no' capture teardown logs
Fix collection error when tests is specified with --doctest-modules
turturica and others added 26 commits August 24, 2018 15:51
…ames. The test doesn't make sense for Windows, because of its case-insensitivity.
Correct cmdclass for doc: Good Integration Practices
Noticed these while working in something else
This will run it with `--show-diff-on-failure` then, and helps to keep
it in line / in a central place.
The code in test_pytester has been refactored into a class right
above the dead code, and the code has been left there by mistake
apparently.
Travis: use TOXENV=linting for linting stage
This is meant to get base coverage on master for codecov.
I just noticed the newly committed code block doesn't format as a code block without `::` in the paragraph before. Perhaps doesn't make a difference, but also corrected 5 spaces to 4 which seems standard.
Collect tests from __init__.py files if they match 'python_files'
Remove dangerous sys.path manipulations in test_pluginmanager
tox: coveralls: also report to codecov
Code block: :: missing and 4 spaces instead of 5
@coveralls
Copy link

Coverage Status

Coverage increased (+0.09%) to 92.644% when pulling 2f2d586 on nicoddemus:merge-master-into-features into 044d2b8 on pytest-dev:features.

@codecov
Copy link

codecov bot commented Aug 26, 2018

Codecov Report

❗ No coverage uploaded for pull request base (features@044d2b8). Click here to learn what that means.
The diff coverage is 93.23%.

Impacted file tree graph

@@             Coverage Diff             @@
##             features    #3884   +/-   ##
===========================================
  Coverage            ?   92.64%           
===========================================
  Files               ?       51           
  Lines               ?     9964           
  Branches            ?        0           
===========================================
  Hits                ?     9231           
  Misses              ?      733           
  Partials            ?        0
Impacted Files Coverage Δ
src/_pytest/outcomes.py 95.89% <0%> (ø)
src/_pytest/runner.py 98.79% <100%> (ø)
src/_pytest/python_api.py 86.14% <100%> (ø)
src/_pytest/debugging.py 60.46% <100%> (ø)
src/_pytest/assertion/util.py 91.5% <100%> (ø)
src/_pytest/fixtures.py 98.22% <100%> (ø)
src/_pytest/recwarn.py 100% <100%> (ø)
src/_pytest/python.py 97.54% <100%> (ø)
src/_pytest/terminal.py 94.42% <100%> (ø)
src/_pytest/setuponly.py 100% <100%> (ø)
... and 6 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 044d2b8...2f2d586. Read the comment docs.

@nicoddemus nicoddemus merged commit 80eef29 into pytest-dev:features Aug 26, 2018
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.