inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-04-29 20:16:44 +00:00
Code

raise a warning for assertations

Browse Source
This commit is contained in:
Matthias 2022-05-17 00:24:02 +02:00
parent b3e42f5fb0
commit 09af7d964d
No known key found for this signature in database
GPG Key ID: AB6D0E6C4CB65093
2 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
InvenTree/InvenTree/tasks.py
View File

@ -3,6 +3,7 @@ from __future__ import unicode_literals
import re import re
import json import json
import warnings
import requests import requests
import logging import logging
@ -12,6 +13,7 @@ from django.utils import timezone
from django.core.exceptions import AppRegistryNotReady from django.core.exceptions import AppRegistryNotReady
from django.db.utils import OperationalError, ProgrammingError from django.db.utils import OperationalError, ProgrammingError
from django.core import mail as django_mail from django.core import mail as django_mail
from django.conf import settings
logger = logging.getLogger("inventree") logger = logging.getLogger("inventree")
@ -53,6 +55,15 @@ def schedule_task(taskname, **kwargs):
pass pass
def raise_warning(msg):
"""Log and raise a warning"""
logger.warning(msg)
# If testing is running raise a warning that can be asserted
if settings.TESTING:
warnings.warn(msg)
def offload_task(taskname, *args, force_sync=False, **kwargs): def offload_task(taskname, *args, force_sync=False, **kwargs):
""" """
Create an AsyncTask if workers are running. Create an AsyncTask if workers are running.
@ -72,7 +83,7 @@ def offload_task(taskname, *args, force_sync=False, **kwargs):
logger.warning(f"Could not offload task '{taskname}' - app registry not ready") logger.warning(f"Could not offload task '{taskname}' - app registry not ready")
return return
except (OperationalError, ProgrammingError): # pragma: no cover except (OperationalError, ProgrammingError): # pragma: no cover
logger.warning(f"Could not offload task '{taskname}' - database not ready") raise_warning(f"Could not offload task '{taskname}' - database not ready")
if is_worker_running() and not force_sync: # pragma: no cover if is_worker_running() and not force_sync: # pragma: no cover
# Running as asynchronous task # Running as asynchronous task
@ -80,7 +91,7 @@ def offload_task(taskname, *args, force_sync=False, **kwargs):
task = AsyncTask(taskname, *args, **kwargs) task = AsyncTask(taskname, *args, **kwargs)
task.run() task.run()
except ImportError: except ImportError:
logger.warning(f"WARNING: '{taskname}' not started - Function not found") raise_warning(f"WARNING: '{taskname}' not started - Function not found")
else: else:
if callable(taskname): if callable(taskname):
@ -92,14 +103,14 @@ def offload_task(taskname, *args, force_sync=False, **kwargs):
app, mod, func = taskname.split('.') app, mod, func = taskname.split('.')
app_mod = app + '.' + mod app_mod = app + '.' + mod
except ValueError: except ValueError:
logger.warning(f"WARNING: '{taskname}' not started - Malformed function path") raise_warning(f"WARNING: '{taskname}' not started - Malformed function path")
return return
# Import module from app # Import module from app
try: try:
_mod = importlib.import_module(app_mod) _mod = importlib.import_module(app_mod)
except ModuleNotFoundError: except ModuleNotFoundError:
logger.warning(f"WARNING: '{taskname}' not started - No module named '{app_mod}'") raise_warning(f"WARNING: '{taskname}' not started - No module named '{app_mod}'")
return return
# Retrieve function # Retrieve function
@ -113,7 +124,7 @@ def offload_task(taskname, *args, force_sync=False, **kwargs):
if not _func: if not _func:
_func = eval(func) # pragma: no cover _func = eval(func) # pragma: no cover
except NameError: except NameError:
logger.warning(f"WARNING: '{taskname}' not started - No function named '{func}'") raise_warning(f"WARNING: '{taskname}' not started - No function named '{func}'")
return return
# Workers are not running: run it as synchronous task # Workers are not running: run it as synchronous task

11
InvenTree/InvenTree/test_tasks.py
View File

@ -72,11 +72,16 @@ class InvenTreeTaskTests(TestCase):
# Error runs # Error runs
# Malformed taskname # Malformed taskname
InvenTree.tasks.offload_task('InvenTree') with self.assertWarnsMessage(UserWarning, "WARNING: 'InvenTree' not started - Malformed function path"):
InvenTree.tasks.offload_task('InvenTree')
# Non exsistent app # Non exsistent app
InvenTree.tasks.offload_task('InvenTreeABC.test_tasks.doesnotmatter') with self.assertWarnsMessage(UserWarning, "WARNING: 'InvenTreeABC.test_tasks.doesnotmatter' not started - No module named 'InvenTreeABC'"):
InvenTree.tasks.offload_task('InvenTreeABC.test_tasks.doesnotmatter')
# Non exsistent function # Non exsistent function
InvenTree.tasks.offload_task('InvenTree.test_tasks.doesnotexsist') with self.assertWarnsMessage(UserWarning, "WARNING: 'InvenTree.test_tasks.doesnotexsist' not started - No function named 'doesnotexsist'"):
InvenTree.tasks.offload_task('InvenTree.test_tasks.doesnotexsist')
def test_task_hearbeat(self): def test_task_hearbeat(self):
"""Test the task heartbeat""" """Test the task heartbeat"""