mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-30 20:31:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

bpo-30131: test_logging now joins queue threads (#1298) (#1317)

Browse source 
QueueListenerTest of test_logging now closes the multiprocessing
Queue and joins its thread to prevent leaking dangling threads to
following tests.

Add also @support.reap_threads to detect earlier if a test leaks
threads (and try to "cleanup" these threads).
(cherry picked from commit 8ca2f2faef)
This commit is contained in:
Victor Stinner 2017-04-28 04:13:53 +02:00 • committed by GitHub
parent caa59c156d
commit cb21f5f3d2
1 changed files with 8 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Lib/test/test_logging.py
View file

@ -3163,6 +3163,7 @@ if hasattr(logging.handlers, 'QueueListener'):
handler.close() handler.close()
@patch.object(logging.handlers.QueueListener, 'handle') @patch.object(logging.handlers.QueueListener, 'handle')
@support.reap_threads
def test_handle_called_with_queue_queue(self, mock_handle): def test_handle_called_with_queue_queue(self, mock_handle):
for i in range(self.repeat): for i in range(self.repeat):
log_queue = queue.Queue() log_queue = queue.Queue()
@ -3172,10 +3173,13 @@ if hasattr(logging.handlers, 'QueueListener'):
@support.requires_multiprocessing_queue @support.requires_multiprocessing_queue
@patch.object(logging.handlers.QueueListener, 'handle') @patch.object(logging.handlers.QueueListener, 'handle')
@support.reap_threads
def test_handle_called_with_mp_queue(self, mock_handle): def test_handle_called_with_mp_queue(self, mock_handle):
for i in range(self.repeat): for i in range(self.repeat):
log_queue = multiprocessing.Queue() log_queue = multiprocessing.Queue()
self.setup_and_log(log_queue, '%s_%s' % (self.id(), i)) self.setup_and_log(log_queue, '%s_%s' % (self.id(), i))
log_queue.close()
log_queue.join_thread()
self.assertEqual(mock_handle.call_count, 5 * self.repeat, self.assertEqual(mock_handle.call_count, 5 * self.repeat,
'correct number of handled log messages') 'correct number of handled log messages')
@ -3188,6 +3192,7 @@ if hasattr(logging.handlers, 'QueueListener'):
return [] return []
@support.requires_multiprocessing_queue @support.requires_multiprocessing_queue
@support.reap_threads
def test_no_messages_in_queue_after_stop(self): def test_no_messages_in_queue_after_stop(self):
""" """
Five messages are logged then the QueueListener is stopped. This Five messages are logged then the QueueListener is stopped. This
@ -3200,6 +3205,9 @@ if hasattr(logging.handlers, 'QueueListener'):
self.setup_and_log(queue, '%s_%s' %(self.id(), i)) self.setup_and_log(queue, '%s_%s' %(self.id(), i))
# time.sleep(1) # time.sleep(1)
items = list(self.get_all_from_queue(queue)) items = list(self.get_all_from_queue(queue))
queue.close()
queue.join_thread()
expected = [[], [logging.handlers.QueueListener._sentinel]] expected = [[], [logging.handlers.QueueListener._sentinel]]
self.assertIn(items, expected, self.assertIn(items, expected,
'Found unexpected messages in queue: %s' % ( 'Found unexpected messages in queue: %s' % (