Issue 28668: Merge 3.5

This commit is contained in:
Xavier de Gaye 2016-11-15 17:03:12 +01:00
commit d178e69ad8
2 changed files with 19 additions and 1 deletions

View file

@ -3124,6 +3124,7 @@ if hasattr(logging.handlers, 'QueueListener'):
self.assertEqual(mock_handle.call_count, 5 * self.repeat,
'correct number of handled log messages')
@support.requires_multiprocessing_queue
@patch.object(logging.handlers.QueueListener, 'handle')
def test_handle_called_with_mp_queue(self, mock_handle):
for i in range(self.repeat):
@ -3140,6 +3141,7 @@ if hasattr(logging.handlers, 'QueueListener'):
except queue.Empty:
return []
@support.requires_multiprocessing_queue
def test_no_messages_in_queue_after_stop(self):
"""
Five messages are logged then the QueueListener is stopped. This