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

Integrate pytest-faulthandler into the core #5441

Merged
merged 2 commits into from Jun 24, 2019

Conversation

nicoddemus
Copy link
Member

  • Add pytest-faulthandler files unchanged
  • Adapt imports and tests
  • Add code to skip registration of the external pytest_faulthandler
    to avoid conflicts

Fix #5440

@codecov
Copy link

codecov bot commented Jun 13, 2019

Codecov Report

Merging #5441 into master will increase coverage by <.01%.
The diff coverage is 97.75%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #5441      +/-   ##
==========================================
+ Coverage   96.03%   96.04%   +<.01%     
==========================================
  Files         115      117       +2     
  Lines       25512    25595      +83     
  Branches     2480     2486       +6     
==========================================
+ Hits        24501    24582      +81     
- Misses        706      707       +1     
- Partials      305      306       +1
Impacted Files Coverage Δ
src/_pytest/config/__init__.py 94.62% <100%> (ø) ⬆️
src/_pytest/faulthandler.py 100% <100%> (ø)
testing/deprecated_test.py 100% <100%> (ø) ⬆️
src/_pytest/deprecated.py 100% <100%> (ø) ⬆️
testing/test_faulthandler.py 94.73% <94.73%> (ø)

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 b713460...3ce31b6. Read the comment docs.

@nicoddemus
Copy link
Member Author

Anymore reviewers? 😁

Copy link
Member

@Zac-HD Zac-HD left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Aside from the timeout type, this looks good to me.

src/_pytest/faulthandler.py Outdated Show resolved Hide resolved
* Add pytest-faulthandler files unchanged
* Adapt imports and tests
* Add code to skip registration of the external `pytest_faulthandler`
  to avoid conflicts

Fix pytest-dev#5440
* The --no-faulthandler option is not necessary given that we can use
  `-p no:faulthandler`.

* The `--faulthandler-timeout` command-line option has become an ini
  option, for the reasons described in
  pytest-dev/pytest-faulthandler#34 and
  users can still set it from the command-line.

Fix pytest-dev/pytest-faulthandler#34
@nicoddemus
Copy link
Member Author

Implemented two small changes in the last commit, with the objective of simplifying the code:

It seems the changes are innocuous and a step in the right direction of having less command-line options when existing options will do. I doubt if this will affect users much too.

Let me know if you have any objections, otherwise I plan to merge this soon. 😁

@nicoddemus nicoddemus merged commit 3f5b078 into pytest-dev:master Jun 24, 2019
@nicoddemus nicoddemus deleted the faulthandler-5440 branch June 24, 2019 23:07
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.

Integrate pytest-faulthandler into the core
3 participants