8000 [3.13] gh-132106: Ensure that running `logging.handlers.QueueListener… by vsajip · Pull Request #132471 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

[3.13] gh-132106: Ensure that running `logging.handlers.QueueListener… #132471

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Apr 13, 2025
Merged

[3.13] gh-132106: Ensure that running `logging.handlers.QueueListener… #132471

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
582b593
[3.13] gh-132106: Ensure that running `logging.handlers.QueueListener…
csm10495 Apr 13, 2025
87c7e67
Tidy up tests.
vsajip Apr 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Tidy up tests.
  • Loading branch information
@vsajip
vsajip committed Apr 13, 2025
commit 87c7e6752db47fd88d18fd508c80b79e19cb14d4
32 changes: 3 additions & 29 deletions Lib/test/test_logging.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4300,8 +4300,6 @@ def test_formatting(self):
self.assertEqual(formatted_msg, log_record.msg)
self.assertEqual(formatted_msg, log_record.message)

@unittest.skipUnless(hasattr(logging.handlers, 'QueueListener'),
'logging.handlers.QueueListener required for this test')
def test_queue_listener(self):
handler = TestHandler(support.Matcher())
listener = logging.handlers.QueueListener(self.queue, handler)
Expand Down Expand Up @@ -4336,40 +4334,18 @@ def test_queue_listener(self):
self.assertTrue(handler.matches(levelno=logging.CRITICAL, message='6'))
handler.close()

def test_queue_listener_context_manager(self):
handler = TestHandler(support.Matcher())
with logging.handlers.QueueListener(self.queue, handler) as listener:
self.assertIsInstance(listener, logging.handlers.QueueListener)
self.assertIsNotNone(listener._thread)
self.assertIsNone(listener._thread)

# doesn't hurt to call stop() more than once.
listener.stop()
self.assertIsNone(listener._thread)

def test_queue_listener_context_manager(self):
handler = TestHandler(support.Matcher())
with logging.handlers.QueueListener(self.queue, handler) as listener:
self.assertIsInstance(listener, logging.handlers.QueueListener)
self.assertIsNotNone(listener._thread)
self.assertIsNone(listener._thread)

# doesn't hurt to call stop() more than once.
listener.stop()
self.assertIsNone(listener._thread)

def test_queue_listener_multi_start(self):
handler = TestHandler(support.Matcher())
with logging.handlers.QueueListener(self.queue, handler) as listener:
self.assertRaises(RuntimeError, listener.start)

with listener:
self.assertRaises(RuntimeError, listener.start)

listener = logging.handlers.QueueListener(self.queue, handler)
listener.start()
self.assertRaises(RuntimeError, listener.start)
listener.stop()
self.assertIsNone(listener._thread)

>>>>>>> 5863cd70b87... gh-132106: Ensure that running `logging.handlers.QueueListener` cannot be started again (GH-132444)
def test_queue_listener_with_StreamHandler(self):
# Test that traceback and stack-info only appends once (bpo-34334, bpo-46755).
listener = logging.handlers.QueueListener(self.queue, self.root_hdlr)
Expand All @@ -4384,8 +4360,6 @@ def test_queue_listener_with_StreamHandler(self):
self.assertEqual(self.stream.getvalue().strip().count('Traceback'), 1)
self.assertEqual(self.stream.getvalue().strip().count('Stack'), 1)

@unittest.skipUnless(hasattr(logging.handlers, 'QueueListener'),
'logging.handlers.QueueListener required for this test')
def test_queue_listener_with_multiple_handlers(self):
# Test that queue handler format doesn't affect other handler formats (bpo-35726).
self.que_hdlr.setFormatter(self.root_formatter)
Expand Down
Loading
0