unit test for logging

Author: rwb27

labthings/core/tasks/pool.py

@@ -4,7 +4,7 @@
 
 from .thread import TaskThread
 
-from flask import copy_current_request_context
+from flask import copy_current_request_context, has_request_context
 
 
 class TaskMaster:
@@ -37,8 +37,11 @@ def states(self):
 
     def new(self, f, *args, **kwargs):
         # copy_current_request_context allows threads to access flask current_app
+        if has_request_context():
+            # The if block stops this failing if we're outside a Flask app.
+            f = copy_current_request_context(f)
         task = TaskThread(
-            target=copy_current_request_context(f), args=args, kwargs=kwargs
+            target=f, args=args, kwargs=kwargs
         )
         self._tasks.append(task)
         return task

labthings/core/tasks/thread.py

@@ -229,7 +229,7 @@ def __init__(self, thread=None, dest=None):
         """
         logging.Handler.__init__(self)
         self.thread = thread
-        self.dest = dest if dest else []
+        self.dest = [] if dest is None else dest
         self.addFilter(self.check_thread)
 
     def check_thread(self, record):
@@ -238,16 +238,18 @@ def check_thread(self, record):
             return 1
         if record.thread == self.thread.ident:
             return 1
+        if record.threadName == self.thread.name:
+            return 1  # TODO: check if this is unsafe, or better with greenlets
         return 0
 
     def emit(self, record):
         """Do something with a logged message"""
-        print("emitting a log")
         record_dict = {"message": record.getMessage()}
         for k in ["created", "levelname", "levelno", "lineno", "filename"]:
             record_dict[k] = getattr(record, k)
         self.dest.append(record_dict)
         # FIXME: make sure this doesn't become a memory disaster!
         # We probably need to check the size of the list...
         # TODO: think about whether any of the keys are security flaws
-        # (this is why I don't dump the whole logrecord)
+        # (this is why I don't dump the whole logrecord)
+        print(f"log is now {self.dest}")

tests/test_tasks.py

@@ -0,0 +1,16 @@
+import pytest
+import labthings.core.tasks as tasks
+import time
+import logging
+
+#@pytest.fixture
+def count(N, dt=0.01):
+    for i in range(N):
+        time.sleep(dt)
+        logging.info(f"Counted to {i}")
+
+def test_logging():
+    logging.getLogger().setLevel("INFO")
+    task = tasks.taskify(count)(10)
+    task.join()
+    assert len(task.log) == 10