p53209761
/
test_ok2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4943 from blueyed/remove-silence_logging_at_shutdown 

capture: do not set logging.raiseExceptions = False
This commit is contained in:
Bruno Oliveira 2019-04-02 22:46:15 -03:00 committed by GitHub
parent 32a8d503a2 08ded2927a
commit 15ea5cef46
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog/4942.trivial.rst Normal file
View File

@ -0,0 +1 @@
``logging.raiseExceptions`` is not set to ``False`` anymore.

7
src/_pytest/capture.py
View File

@ -56,13 +56,6 @@ def pytest_load_initial_conftests(early_config, parser, args):
# make sure that capturemanager is properly reset at final shutdown # make sure that capturemanager is properly reset at final shutdown
early_config.add_cleanup(capman.stop_global_capturing) early_config.add_cleanup(capman.stop_global_capturing)
# make sure logging does not raise exceptions at the end
def silence_logging_at_shutdown():
if "logging" in sys.modules:
sys.modules["logging"].raiseExceptions = False
early_config.add_cleanup(silence_logging_at_shutdown)
# finally trigger conftest loading but while capturing (issue93) # finally trigger conftest loading but while capturing (issue93)
capman.start_global_capturing() capman.start_global_capturing()
outcome = yield outcome = yield