From 140c2ff593bb506318fa7204cd9920c42e6f5871 Mon Sep 17 00:00:00 2001 From: Deepsingh Chhabda Date: Fri, 14 Oct 2022 14:53:27 -0400 Subject: [PATCH] add tests --- pybossa/jobs.py | 4 ++-- test/test_jobs/__init__.py | 22 ++++++++++++++++++++++ 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/pybossa/jobs.py b/pybossa/jobs.py index 952b5e3d9a..afa6ce2c54 100644 --- a/pybossa/jobs.py +++ b/pybossa/jobs.py @@ -1575,8 +1575,8 @@ def perform_completed_tasks_cleanup(): cleanup_days = -1 if cleanup_days not in valid_days: current_app.logger.info( - f"Skipping project cleanup days due to invalid configuration," - f"project id {project_id}, completed_tasks_cleanup_days {cleanup_days}, valid days {valid_days}" + f"Skipping project cleanup days due to invalid cleanup days," + f"project id {project_id}, completed_tasks_cleanup_days {row.cleanup_days}, valid days {valid_days}" ) else: projects.append((project_id, cleanup_days)) diff --git a/test/test_jobs/__init__.py b/test/test_jobs/__init__.py index 74bb4d1df7..5fe9c1debe 100644 --- a/test/test_jobs/__init__.py +++ b/test/test_jobs/__init__.py @@ -354,3 +354,25 @@ def test_saturday_4pm_date(self): date2 = datetime.strptime("2026-01-31 10:00AM", "%Y-%m-%d %I:%M%p") saturday = get_saturday_4pm_date(date2) assert saturday.strftime("%Y-%m-%d %H:%M:%S") == "2026-01-31 16:00:00" + + @with_context + @patch('pybossa.jobs.purge_task_data') + def test_completed_tasks_cleanup_bad_config(self, mock_purge_tasks): + """Test completed_tasks_cleanup deletes tasks qualify for deletion.""" + + from flask import current_app + current_app.config['COMPLETED_TASK_CLEANUP_DAYS'] = [(None, None)] + perform_completed_tasks_cleanup() + assert not mock_purge_tasks.called + + @with_context + @patch('pybossa.jobs.purge_task_data') + def test_completed_tasks_cleanup_bad_project_config(self, mock_purge_tasks): + """Test completed_tasks_cleanup deletes tasks qualify for deletion.""" + + from flask import current_app + current_app.config['COMPLETED_TASK_CLEANUP_DAYS'] = [(30, "30 days"), (60, "60 days")] + ProjectFactory.create(info=dict(completed_tasks_cleanup_days=240)) + ProjectFactory.create(info=dict(completed_tasks_cleanup_days="xyz")) + perform_completed_tasks_cleanup() + assert not mock_purge_tasks.called