Skip to content

Commit

Permalink
capture: do not set logging.raiseExceptions = False
Browse files Browse the repository at this point in the history
Ref: #4942
  • Loading branch information
blueyed committed Mar 18, 2019
1 parent c1e01c2 commit 3fdaa58
Showing 1 changed file with 0 additions and 7 deletions.
7 changes: 0 additions & 7 deletions src/_pytest/capture.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,6 @@ def pytest_load_initial_conftests(early_config, parser, args):
# make sure that capturemanager is properly reset at final shutdown
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)
capman.start_global_capturing()
outcome = yield
Expand Down

0 comments on commit 3fdaa58

Please sign in to comment.