Skip to content

Commit be603fa

Browse files
cunlacunla
committed
wip
1 parent 6961132 commit be603fa

File tree

7 files changed

+36
-36
lines changed

7 files changed

+36
-36
lines changed

‎scheduler/tests/test_old_models/test_old_models.py‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
from scheduler.queues import get_queue
1414
from scheduler.tests import jobs
1515
from scheduler.tests.testtools import (
16-
old_task_factory, taskarg_factory, _get_job_from_scheduled_registry, SchedulerBaseCase, _get_executions)
16+
old_task_factory, taskarg_factory, _get_task_job_execution_from_registry, SchedulerBaseCase, _get_executions)
1717
from scheduler.tools import run_task, create_worker
1818

1919

@@ -174,15 +174,15 @@ def test_str(self):
174174

175175
def test_callable_passthrough(self):
176176
task = old_task_factory(self.TaskModelClass)
177-
entry = _get_job_from_scheduled_registry(task)
177+
entry = _get_task_job_execution_from_registry(task)
178178
self.assertEqual(entry.func, run_task)
179179
job_model, job_id = entry.args
180180
self.assertEqual(job_model, self.TaskModelClass.__name__)
181181
self.assertEqual(job_id, task.id)
182182

183183
def test_timeout_passthrough(self):
184184
task = old_task_factory(self.TaskModelClass, timeout=500)
185-
entry = _get_job_from_scheduled_registry(task)
185+
entry = _get_task_job_execution_from_registry(task)
186186
self.assertEqual(entry.timeout, 500)
187187

188188
def test_at_front_passthrough(self):
@@ -195,12 +195,12 @@ def test_callable_result(self):
195195
task = old_task_factory(
196196
self.TaskModelClass,
197197
)
198-
entry = _get_job_from_scheduled_registry(task)
198+
entry = _get_task_job_execution_from_registry(task)
199199
self.assertEqual(entry.perform(), 2)
200200

201201
def test_callable_empty_args_and_kwargs(self):
202202
task = old_task_factory(self.TaskModelClass, callable="scheduler.tests.jobs.test_args_kwargs")
203-
entry = _get_job_from_scheduled_registry(task)
203+
entry = _get_task_job_execution_from_registry(task)
204204
self.assertEqual(entry.perform(), "test_args_kwargs()")
205205

206206
def test_delete_args(self):
@@ -253,7 +253,7 @@ def test_callable_args_and_kwargs(self):
253253
taskarg_factory(TaskKwarg, key="key2", arg_type="datetime", val=date, content_object=task)
254254
taskarg_factory(TaskKwarg, key="key3", arg_type="bool", val=False, content_object=task)
255255
task.save()
256-
entry = _get_job_from_scheduled_registry(task)
256+
entry = _get_task_job_execution_from_registry(task)
257257
self.assertEqual(entry.perform(), "test_args_kwargs('one', key1=2, key2={}, key3=False)".format(date))
258258

259259
def test_function_string(self):
@@ -385,7 +385,7 @@ def test_admin_enqueue_job_now(self):
385385

386386
# assert part 1
387387
self.assertEqual(200, res.status_code)
388-
entry = _get_job_from_scheduled_registry(task)
388+
entry = _get_task_job_execution_from_registry(task)
389389
task_model, scheduled_task_id = entry.args
390390
self.assertEqual(task_model, task.task_type)
391391
self.assertEqual(scheduled_task_id, task.id)
@@ -400,7 +400,7 @@ def test_admin_enqueue_job_now(self):
400400
worker.work(burst=True)
401401

402402
# assert 2
403-
entry = _get_job_from_scheduled_registry(task)
403+
entry = _get_task_job_execution_from_registry(task)
404404
self.assertEqual(task_model, task.task_type)
405405
self.assertEqual(scheduled_task_id, task.id)
406406
assert_has_execution_with_status(task, "finished")
@@ -526,7 +526,7 @@ def test_schedule_time_with_tz(self):
526526

527527
def test_result_ttl_passthrough(self):
528528
job = old_task_factory(self.TaskModelClass, result_ttl=500)
529-
entry = _get_job_from_scheduled_registry(job)
529+
entry = _get_task_job_execution_from_registry(job)
530530
self.assertEqual(entry.result_ttl, 500)
531531

532532

‎scheduler/tests/test_old_models/test_old_repeatable_task.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
from scheduler.models import RepeatableTask
99
from scheduler.tests.test_old_models.test_old_task_model import BaseTestCases
1010

11-
from scheduler.tests.testtools import old_task_factory, _get_job_from_scheduled_registry
11+
from scheduler.tests.testtools import old_task_factory, _get_task_job_execution_from_registry
1212

1313

1414
class TestRepeatableTask(BaseTestCases.TestSchedulableTask):
@@ -121,12 +121,12 @@ def test_result_interval(self):
121121
job = old_task_factory(
122122
self.TaskModelClass,
123123
)
124-
entry = _get_job_from_scheduled_registry(job)
124+
entry = _get_task_job_execution_from_registry(job)
125125
self.assertEqual(entry.meta["interval"], 3600)
126126

127127
def test_repeat(self):
128128
job = old_task_factory(self.TaskModelClass, repeat=10)
129-
entry = _get_job_from_scheduled_registry(job)
129+
entry = _get_task_job_execution_from_registry(job)
130130
self.assertEqual(entry.meta["repeat"], 10)
131131

132132
def test_repeat_old_job_exhausted(self):

‎scheduler/tests/test_old_models/test_old_task_model.py‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
from scheduler.models import BaseTask, TaskArg, TaskKwarg, ScheduledTask
1313
from scheduler.tools import run_task, create_worker
1414
from scheduler.tests import jobs
15-
from scheduler.tests.testtools import old_task_factory, taskarg_factory, _get_job_from_scheduled_registry, \
15+
from scheduler.tests.testtools import old_task_factory, taskarg_factory, _get_task_job_execution_from_registry, \
1616
SchedulerBaseCase, _get_executions
1717
from scheduler.queues import get_queue
1818

@@ -174,15 +174,15 @@ def test_str(self):
174174

175175
def test_callable_passthrough(self):
176176
task = old_task_factory(self.TaskModelClass)
177-
entry = _get_job_from_scheduled_registry(task)
177+
entry = _get_task_job_execution_from_registry(task)
178178
self.assertEqual(entry.func, run_task)
179179
job_model, job_id = entry.args
180180
self.assertEqual(job_model, self.TaskModelClass.__name__)
181181
self.assertEqual(job_id, task.id)
182182

183183
def test_timeout_passthrough(self):
184184
task = old_task_factory(self.TaskModelClass, timeout=500)
185-
entry = _get_job_from_scheduled_registry(task)
185+
entry = _get_task_job_execution_from_registry(task)
186186
self.assertEqual(entry.timeout, 500)
187187

188188
def test_at_front_passthrough(self):
@@ -195,12 +195,12 @@ def test_callable_result(self):
195195
task = old_task_factory(
196196
self.TaskModelClass,
197197
)
198-
entry = _get_job_from_scheduled_registry(task)
198+
entry = _get_task_job_execution_from_registry(task)
199199
self.assertEqual(entry.perform(), 2)
200200

201201
def test_callable_empty_args_and_kwargs(self):
202202
task = old_task_factory(self.TaskModelClass, callable="scheduler.tests.jobs.test_args_kwargs")
203-
entry = _get_job_from_scheduled_registry(task)
203+
entry = _get_task_job_execution_from_registry(task)
204204
self.assertEqual(entry.perform(), "test_args_kwargs()")
205205

206206
def test_delete_args(self):
@@ -253,7 +253,7 @@ def test_callable_args_and_kwargs(self):
253253
taskarg_factory(TaskKwarg, key="key2", arg_type="datetime", val=date, content_object=task)
254254
taskarg_factory(TaskKwarg, key="key3", arg_type="bool", val=False, content_object=task)
255255
task.save()
256-
entry = _get_job_from_scheduled_registry(task)
256+
entry = _get_task_job_execution_from_registry(task)
257257
self.assertEqual(entry.perform(), "test_args_kwargs('one', key1=2, key2={}, key3=False)".format(date))
258258

259259
def test_function_string(self):
@@ -387,7 +387,7 @@ def test_admin_enqueue_job_now(self):
387387

388388
# assert part 1
389389
self.assertEqual(200, res.status_code)
390-
entry = _get_job_from_scheduled_registry(task)
390+
entry = _get_task_job_execution_from_registry(task)
391391
task_model, scheduled_task_id = entry.args
392392
self.assertEqual(task_model, task.task_type)
393393
self.assertEqual(scheduled_task_id, task.id)
@@ -402,7 +402,7 @@ def test_admin_enqueue_job_now(self):
402402
worker.work(burst=True)
403403

404404
# assert 2
405-
entry = _get_job_from_scheduled_registry(task)
405+
entry = _get_task_job_execution_from_registry(task)
406406
self.assertEqual(task_model, task.task_type)
407407
self.assertEqual(scheduled_task_id, task.id)
408408
assert_has_execution_with_status(task, "finished")
@@ -528,7 +528,7 @@ def test_schedule_time_with_tz(self):
528528

529529
def test_result_ttl_passthrough(self):
530530
job = old_task_factory(self.TaskModelClass, result_ttl=500)
531-
entry = _get_job_from_scheduled_registry(job)
531+
entry = _get_task_job_execution_from_registry(job)
532532
self.assertEqual(entry.result_ttl, 500)
533533

534534

‎scheduler/tests/test_task_types/test_repeatable_task.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
from scheduler import settings
88
from scheduler.models import RepeatableTask
9-
from scheduler.tests.testtools import task_factory, _get_job_from_scheduled_registry
9+
from scheduler.tests.testtools import task_factory, _get_task_job_execution_from_registry
1010
from scheduler.tools import TaskType
1111
from scheduler.tests.test_task_types.test_task_model import BaseTestCases
1212

@@ -121,12 +121,12 @@ def test_result_interval(self):
121121
job = task_factory(
122122
self.task_type,
123123
)
124-
entry = _get_job_from_scheduled_registry(job)
124+
entry = _get_task_job_execution_from_registry(job)
125125
self.assertEqual(entry.meta["interval"], 3600)
126126

127127
def test_repeat(self):
128128
job = task_factory(self.task_type, repeat=10)
129-
entry = _get_job_from_scheduled_registry(job)
129+
entry = _get_task_job_execution_from_registry(job)
130130
self.assertEqual(entry.meta["repeat"], 10)
131131

132132
def test_repeat_old_job_exhausted(self):

‎scheduler/tests/test_task_types/test_task_model.py‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
from scheduler.queues import get_queue
1515
from scheduler.tests import jobs
1616
from scheduler.tests.testtools import (
17-
task_factory, taskarg_factory, _get_job_from_scheduled_registry,
17+
task_factory, taskarg_factory, _get_task_job_execution_from_registry,
1818
SchedulerBaseCase, _get_executions, )
1919
from scheduler.tools import run_task, create_worker
2020

@@ -166,15 +166,15 @@ def test_str(self):
166166

167167
def test_callable_passthrough(self):
168168
task = task_factory(self.task_type)
169-
entry = _get_job_from_scheduled_registry(task)
169+
entry = _get_task_job_execution_from_registry(task)
170170
self.assertEqual(entry.func, run_task)
171171
job_model, job_id = entry.args
172172
self.assertEqual(job_model, self.task_type.value)
173173
self.assertEqual(job_id, task.id)
174174

175175
def test_timeout_passthrough(self):
176176
task = task_factory(self.task_type, timeout=500)
177-
entry = _get_job_from_scheduled_registry(task)
177+
entry = _get_task_job_execution_from_registry(task)
178178
self.assertEqual(entry.timeout, 500)
179179

180180
def test_at_front_passthrough(self):
@@ -185,12 +185,12 @@ def test_at_front_passthrough(self):
185185

186186
def test_callable_result(self):
187187
task = task_factory(self.task_type)
188-
entry = _get_job_from_scheduled_registry(task)
188+
entry = _get_task_job_execution_from_registry(task)
189189
self.assertEqual(entry.perform(), 2)
190190

191191
def test_callable_empty_args_and_kwargs(self):
192192
task = task_factory(self.task_type, callable="scheduler.tests.jobs.test_args_kwargs")
193-
entry = _get_job_from_scheduled_registry(task)
193+
entry = _get_task_job_execution_from_registry(task)
194194
self.assertEqual(entry.perform(), "test_args_kwargs()")
195195

196196
def test_delete_args(self):
@@ -235,7 +235,7 @@ def test_callable_args_and_kwargs(self):
235235
taskarg_factory(TaskKwarg, key="key2", arg_type="datetime", val=date, content_object=task)
236236
taskarg_factory(TaskKwarg, key="key3", arg_type="bool", val=False, content_object=task)
237237
task.save()
238-
entry = _get_job_from_scheduled_registry(task)
238+
entry = _get_task_job_execution_from_registry(task)
239239
self.assertEqual(entry.perform(), "test_args_kwargs('one', key1=2, key2={}, key3=False)".format(date))
240240

241241
def test_function_string(self):
@@ -363,7 +363,7 @@ def test_admin_enqueue_job_now(self):
363363

364364
# assert part 1
365365
self.assertEqual(200, res.status_code)
366-
entry = _get_job_from_scheduled_registry(task)
366+
entry = _get_task_job_execution_from_registry(task)
367367
task_model, scheduled_task_id = entry.args
368368
self.assertEqual(task_model, task.task_type)
369369
self.assertEqual(scheduled_task_id, task.id)
@@ -378,7 +378,7 @@ def test_admin_enqueue_job_now(self):
378378
worker.work(burst=True)
379379

380380
# assert 2
381-
entry = _get_job_from_scheduled_registry(task)
381+
entry = _get_task_job_execution_from_registry(task)
382382
self.assertEqual(task_model, task.task_type)
383383
self.assertEqual(scheduled_task_id, task.id)
384384
assert_has_execution_with_status(task, "finished")
@@ -504,7 +504,7 @@ def test_schedule_time_with_tz(self):
504504

505505
def test_result_ttl_passthrough(self):
506506
job = task_factory(self.task_type, result_ttl=500)
507-
entry = _get_job_from_scheduled_registry(job)
507+
entry = _get_task_job_execution_from_registry(job)
508508
self.assertEqual(entry.result_ttl, 500)
509509

510510

‎scheduler/tests/test_views.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
from scheduler.rq_classes import JobExecution, ExecutionStatus
1212
from scheduler.tests import test_settings # noqa
1313
from scheduler.tests.jobs import failing_job, long_job, test_job
14-
from scheduler.tests.testtools import assert_message_in_response, task_factory, _get_job_from_scheduled_registry
14+
from scheduler.tests.testtools import assert_message_in_response, task_factory, _get_task_job_execution_from_registry
1515
from scheduler.tools import create_worker, TaskType
1616

1717

@@ -358,7 +358,7 @@ def test_job_details(self):
358358
def test_scheduled_job_details(self):
359359
"""Job data is displayed properly"""
360360
scheduled_job = task_factory(TaskType.ONCE, enabled=True)
361-
job = _get_job_from_scheduled_registry(scheduled_job)
361+
job = _get_task_job_execution_from_registry(scheduled_job)
362362

363363
url = reverse(
364364
"job_details",

‎scheduler/tests/testtools.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ def taskarg_factory(cls, **kwargs):
128128
return instance
129129

130130

131-
def _get_job_from_scheduled_registry(django_task: BaseTask):
131+
def _get_task_job_execution_from_registry(django_task: BaseTask):
132132
jobs_to_schedule = django_task.rqueue.scheduled_job_registry.get_job_ids()
133133
entry = next(i for i in jobs_to_schedule if i == django_task.job_id)
134134
return django_task.rqueue.fetch_job(entry)

0 commit comments

Comments
 (0)