[3.6] bpo-30131: test_logging now joins queue threads (#1298) by vstinner · Pull Request #1317 · python/cpython

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