Merge remote-tracking branch 'origin/master' into gevent-pool

Author: Joel Collins

tests/test_core_tasks_thread.py

@@ -3,6 +3,7 @@
 
 import gevent
 from gevent.thread import get_ident
+import time
 
 
 def test_task_with_args():
@@ -85,18 +86,28 @@ def test_task_log_list():
     import logging
     import os
 
+    logging.getLogger().setLevel("INFO")
+
     def task_func():
         logging.warning("Task warning")
+        for i in range(10):
+            time.sleep(0.001)
+            logging.info(f"Counted to {i}")
 
     task_obj = thread.TaskThread(target=task_func)
     task_obj.start()
     task_obj.started_event.wait()
 
-    assert len(task_obj.log) == 1
+    assert len(task_obj.log) >= 1
     assert task_obj.log[0]["message"] == "Task warning"
     assert task_obj.log[0]["levelname"] == "WARNING"
     assert task_obj.log[0]["filename"] == os.path.basename(__file__)
 
+    task_obj.join()
+    assert (
+        len(task_obj.log) == 11
+    ), "Didn't get the right number of log entries - are INFO entries being logged?"
+
 
 def test_task_log_without_thread():