Skip to content

Merge master into features #3914

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

Conversation

nicoddemus
Copy link
Member

No description provided.

nicoddemus and others added 30 commits August 26, 2018 17:12
Cache now obeys -q when showing summary for --lf and --ff
Fix bad console output when using console_output_style=classic
…write

What happens is that atomic_write on Python 2.7 on Windows will try
to convert the paths to unicode, but this triggers the import of
the encoding module for the file system codec, which in turn triggers
the rewrite, which in turn again tries to import the module, and so on.

This short-circuits the cases where we try to import another file when
writing a pyc file; I don't expect this to affect anything because
the only modules that could be affected are those imported by
atomic_writes.

Fix pytest-dev#3506
Avoid possible infinite recursion when writing pyc files in assert rewrite
nicoddemus and others added 13 commits August 29, 2018 08:20
- Skips pypy for coverage, reports only py37 to coveralls
- tox: allow for TOXENV=py37-coverage
- tracks coverage in subprocesses, using coverage-enable-subprocess, and
  parallel=1
- removes usedevelop with doctesting to match `--source` being used with
  coverage
- keep coveralls for now, used with AppVeyor
doctesting: remove changedir

With coverage 5 we could use COVERAGE_RCFILE to make it find the
.coveragerc, or we could add `--rcfile` to _PYTEST_TOX_COVERAGE_RUN, but
I've thought that this should not be the job that has to test if
`--pyargs` actually works.
Given that our guidelines demand that the CI have already passed, it seems
wasteful to run all those jobs again for the exact same commit.

As discussed in pytest-dev#3906 (comment),
this will skip the "test" stage when building a tag for deployment.
Skip the "test" stage when making a release
Travis: report coverage with all builds
doc fix: raises accepts tuples instead of lists
@RonnyPfannschmidt
Copy link
Member

looks like the tox setup is now broken

@RonnyPfannschmidt
Copy link
Member

@blueyed can you take a look, it seems related to that coverage hack not working as "expected"

@nicoddemus
Copy link
Member Author

Actually this just seems like a conflicting test now that we merged #3912 into features. I will take a look. 👍

…ints_no_needless_message

* test_lf_and_ff_obey_verbosity is no longer necessary because
  test_lf_and_ff_prints_no_needless_message already checks if the proper messages
  are displayed when -q is used.

* Improve test_lf_and_ff_prints_no_needless_message so we also check that
  the correct message is displayed when there are failures to run
@nicoddemus
Copy link
Member Author

Should be working now. 👍

@codecov
Copy link

codecov bot commented Aug 31, 2018

Codecov Report

Merging #3914 into features will increase coverage by 4.03%.
The diff coverage is 92.3%.

Impacted file tree graph

@@             Coverage Diff              @@
##           features    #3914      +/-   ##
============================================
+ Coverage      92.2%   96.24%   +4.03%     
============================================
  Files            52      108      +56     
  Lines         10016    23409   +13393     
============================================
+ Hits           9235    22529   +13294     
- Misses          781      880      +99
Flag Coverage Δ
#doctesting 31.84% <22.44%> (?)
#nobyte 93.5% <85.71%> (?)
#numpy 31.41% <20.4%> (?)
#pexpect 53.54% <71.42%> (?)
#pluggymaster 95.08% <89.23%> (?)
#py27 94.6% <90.76%> (?)
#py34 93.89% <87.69%> (?)
#py35 93.9% <87.69%> (?)
#py36 94.82% <87.69%> (?)
#py37 94.06% <90.76%> (?)
#trial 34.08% <20.4%> (?)
#xdist 94.65% <87.69%> (?)
Impacted Files Coverage Δ
src/_pytest/skipping.py 98.78% <ø> (+1.82%) ⬆️
src/_pytest/warnings.py 87.71% <ø> (+10.52%) ⬆️
src/_pytest/python.py 97.54% <ø> (ø) ⬆️
testing/deprecated_test.py 100% <ø> (ø)
src/_pytest/assertion/rewrite.py 97.16% <100%> (+10.4%) ⬆️
testing/python/fixture.py 99.23% <100%> (ø)
testing/test_terminal.py 99.4% <100%> (ø)
src/_pytest/terminal.py 95.8% <100%> (+2.37%) ⬆️
testing/code/test_source.py 96.8% <100%> (ø)
testing/test_assertrewrite.py 83.75% <100%> (ø)
... and 83 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 64f0068...2256f2f. Read the comment docs.

@dhirensr
Copy link
Contributor

@nicoddemus : do I need to improve the tests there? is there any problem?

@nicoddemus
Copy link
Member Author

@dhirensr no need, I already did it in 2256f2f 👍

@coveralls
Copy link

Coverage Status

Coverage increased (+1.9%) to 94.061% when pulling 2256f2f on nicoddemus:merge-master-into-features into 64f0068 on pytest-dev:features.

@RonnyPfannschmidt RonnyPfannschmidt merged commit 01df368 into pytest-dev:features Aug 31, 2018
@nicoddemus nicoddemus deleted the merge-master-into-features branch August 31, 2018 13: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.

9 participants