fix(parsers): close stale source jobs
This commit is contained in:
@@ -12,6 +12,7 @@ from types import SimpleNamespace
|
||||
from unittest.mock import patch
|
||||
from urllib.parse import urlparse
|
||||
|
||||
from apps.core.services import BackgroundJobService
|
||||
from apps.parsers import tasks as parser_tasks
|
||||
from apps.parsers.clients.base import HTTPError
|
||||
from apps.parsers.clients.minpromtorg.industrial import (
|
||||
@@ -285,14 +286,46 @@ class GenericSourceFetchTestCase(TestCase):
|
||||
ParserLoadLogService,
|
||||
"mark_stale_in_progress_failed",
|
||||
return_value=2,
|
||||
) as cleanup_mock:
|
||||
) as cleanup_mock, patch.object(
|
||||
BackgroundJobService,
|
||||
"mark_stale_active_jobs_failed",
|
||||
return_value=3,
|
||||
) as jobs_cleanup_mock:
|
||||
result = parser_tasks.cleanup_stale_parser_loads(max_age_minutes=45)
|
||||
|
||||
cleanup_mock.assert_called_once_with(max_age_minutes=45)
|
||||
jobs_cleanup_mock.assert_called_once()
|
||||
self.assertEqual(jobs_cleanup_mock.call_args.kwargs["max_age_minutes"], 45)
|
||||
self.assertEqual(result["status"], "success")
|
||||
self.assertEqual(result["marked_failed"], 2)
|
||||
self.assertEqual(result["marked_jobs_failed"], 3)
|
||||
self.assertEqual(result["max_age_minutes"], 45)
|
||||
|
||||
def test_get_or_create_background_job_merges_meta_for_precreated_job(self):
|
||||
BackgroundJobService.create_job(
|
||||
task_id="precreated-task",
|
||||
task_name="apps.parsers.tasks.parse_industrial_products",
|
||||
user_id=None,
|
||||
meta={
|
||||
"source": ParserLoadLog.Source.INDUSTRIAL_PRODUCTS,
|
||||
"source_card": "manufacturers-and-products",
|
||||
},
|
||||
)
|
||||
|
||||
job = parser_tasks._get_or_create_background_job(
|
||||
task_id="precreated-task",
|
||||
task_name="apps.parsers.tasks.parse_industrial_products",
|
||||
source=ParserLoadLog.Source.INDUSTRIAL_PRODUCTS,
|
||||
batch_id=7,
|
||||
requested_by_id=42,
|
||||
meta={"source_key": "mpt_products"},
|
||||
)
|
||||
|
||||
self.assertEqual(job.user_id, 42)
|
||||
self.assertEqual(job.meta["source_card"], "manufacturers-and-products")
|
||||
self.assertEqual(job.meta["source_key"], "mpt_products")
|
||||
self.assertEqual(job.meta["batch_id"], 7)
|
||||
|
||||
|
||||
@override_settings(
|
||||
CELERY_TASK_ALWAYS_EAGER=True,
|
||||
|
||||
Reference in New Issue
Block a user