capture: fix disabled()/global_and_fixture_disabled() enabling capturing when it was disabled#7651
Merged
bluetech merged 1 commit intopytest-dev:masterfrom Aug 24, 2020
Merged
Conversation
…ing when it was disabled The `CaptureManager.global_and_fixture_disabled()` context manager (and `CaptureFixture.disabled()` which calls it) did `suspend(); ...; resume()` but if the capturing was already suspended, the `resume()` would resume it when it shouldn't. This caused caused some messages to be swallowed when `--log-cli` is used because it uses `global_and_fixture_disabled` when capturing is not necessarily resumed.
e10eae8 to
0d5a650
Compare
Member
Author
|
The code that coverage says is uncovered is definitely executed by the |
nicoddemus
approved these changes
Aug 22, 2020
Member
That's possible, coverage does need special handling to be enabled from subprocesses: |
Member
Author
|
Thanks for the link @nicoddemus, looks a bit too involved for me to get working ATM, so I opened #7679 to track this. |
bluetech
added a commit
to bluetech/pytest
that referenced
this pull request
Sep 4, 2020
capture: fix disabled()/global_and_fixture_disabled() enabling capturing when it was disabled (cherry picked from commit bb38ae9)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The
CaptureManager.global_and_fixture_disabled()context manager (andCaptureFixture.disabled()which calls it) didsuspend(); ...; resume()but if the capturing was already suspended, theresume()would resume it when it shouldn't.This caused caused some messages to be swallowed when
--log-cliis used because it usesglobal_and_fixture_disabledwhen capturing is not necessarily resumed.