Skip to content

Commit

Permalink
logging: del item.catch_log_handler only in teardown
Browse files Browse the repository at this point in the history
Without this caplog.record_tuples etc is not available anymore when using
`--pdb`.
  • Loading branch information
blueyed committed Sep 19, 2018
1 parent bb57186 commit dccb96f
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 1 deletion.
2 changes: 1 addition & 1 deletion src/_pytest/logging.py
Original file line number Diff line number Diff line change
Expand Up @@ -445,8 +445,8 @@ def _runtest_for(self, item, when):
try:
yield # run test
finally:
del item.catch_log_handler
if when == "teardown":
del item.catch_log_handler
del item.catch_log_handlers

if self.print_logs:
Expand Down
16 changes: 16 additions & 0 deletions testing/test_pdb.py
Original file line number Diff line number Diff line change
Expand Up @@ -397,6 +397,22 @@ def test_1(capsys):
child.read()
self.flush(child)

def test_pdb_with_caplog_on_pdb_invocation(self, testdir):
p1 = testdir.makepyfile(
"""
def test_1(capsys, caplog):
import logging
logging.getLogger(__name__).warning("some_warning")
assert 0
"""
)
child = testdir.spawn_pytest('--pdb %s' % str(p1))
child.send("caplog.record_tuples\n")
child.expect_exact("[('test_pdb_with_caplog_on_pdb_invocation', 30, 'some_warning')]")
child.sendeof()
child.read()
self.flush(child)

def test_set_trace_capturing_afterwards(self, testdir):
p1 = testdir.makepyfile(
"""
Expand Down

0 comments on commit dccb96f

Please sign in to comment.