wip

Author: cunla

scheduler/tests/test_old_models.py

@@ -341,9 +341,7 @@ def test_admin_run_job_now_enqueues_job_at(self):
         def test_admin_change_view(self):
             # arrange
             self.client.login(username="admin", password="admin")
-            task = old_task_factory(
-                self.TaskModelClass,
-            )
+            task = old_task_factory(self.TaskModelClass)
             model = task._meta.model.__name__.lower()
             url = reverse(
                 f"admin:scheduler_{model}_change",
@@ -512,7 +510,7 @@ def test_admin_delete_selected(self):
             scheduled_jobs = queue.scheduled_job_registry.get_job_ids()
             self.assertNotIn(job_id, scheduled_jobs)
 
-    class TestSchedulableJob(TestBaseTask):
+    class TestSchedulableTask(TestBaseTask):
         # Currently ScheduledJob and RepeatableJob
         TaskModelClass = ScheduledTask
 
@@ -537,7 +535,7 @@ def test_result_ttl_passthrough(self):
             self.assertEqual(entry.result_ttl, 500)
 
 
-class TestScheduledJob(BaseTestCases.TestSchedulableJob):
+class TestScheduledTask(BaseTestCases.TestSchedulableTask):
     TaskModelClass = ScheduledTask
 
     def test_clean(self):

scheduler/tests/test_views.py

@@ -8,12 +8,11 @@
 from django.urls import reverse
 
 from scheduler.queues import get_queue
-from scheduler.tools import create_worker
-from . import test_settings  # noqa
-from .jobs import failing_job, long_job, test_job
-from .testtools import assert_message_in_response, task_factory, _get_job_from_scheduled_registry
-from ..models import ScheduledTask
-from ..rq_classes import JobExecution, ExecutionStatus
+from scheduler.rq_classes import JobExecution, ExecutionStatus
+from scheduler.tests import test_settings  # noqa
+from scheduler.tests.jobs import failing_job, long_job, test_job
+from scheduler.tests.testtools import assert_message_in_response, task_factory, _get_job_from_scheduled_registry
+from scheduler.tools import create_worker, TaskType
 
 
 class BaseTestCase(TestCase):
@@ -358,7 +357,7 @@ def test_job_details(self):
 
     def test_scheduled_job_details(self):
         """Job data is displayed properly"""
-        scheduled_job = task_factory(ScheduledTask, enabled=True)
+        scheduled_job = task_factory(TaskType.ONCE, enabled=True)
         job = _get_job_from_scheduled_registry(scheduled_job)
 
         url = reverse(