Skip to content

Commit 5f61587

Browse files
cunlacunla
committed
refactor
1 parent b537abf commit 5f61587

File tree

5 files changed

+83
-83
lines changed

5 files changed

+83
-83
lines changed

‎scheduler/tests/test_mgmt_commands/test_import.py

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -21,21 +21,21 @@ def tearDown(self) -> None:
2121
os.remove(self.tmpfile.name)
2222

2323
def test_import__should_schedule_job(self):
24-
jobs = list()
25-
jobs.append(task_factory(TaskType.ONCE, enabled=True, instance_only=True))
26-
jobs.append(task_factory(TaskType.REPEATABLE, enabled=True, instance_only=True))
27-
res = json.dumps([j.to_dict() for j in jobs])
24+
tasks = list()
25+
tasks.append(task_factory(TaskType.ONCE, enabled=True, instance_only=True))
26+
tasks.append(task_factory(TaskType.REPEATABLE, enabled=True, instance_only=True))
27+
res = json.dumps([j.to_dict() for j in tasks])
2828
self.tmpfile.write(res)
2929
self.tmpfile.flush()
3030
# act
3131
call_command("import", filename=self.tmpfile.name)
3232
# assert
3333
self.assertEqual(1, Task.objects.filter(task_type=TaskType.ONCE).count())
3434
self.assertEqual(1, Task.objects.filter(task_type=TaskType.REPEATABLE).count())
35-
db_job = Task.objects.filter(task_type=TaskType.ONCE).first()
35+
tasks = Task.objects.filter(task_type=TaskType.ONCE).first()
3636
attrs = ["name", "queue", "callable", "enabled", "timeout"]
3737
for attr in attrs:
38-
self.assertEqual(getattr(jobs[0], attr), getattr(db_job, attr))
38+
self.assertEqual(getattr(tasks[0], attr), getattr(tasks, attr))
3939

4040
def test_import__should_schedule_job_yaml(self):
4141
tasks = list()
@@ -49,16 +49,16 @@ def test_import__should_schedule_job_yaml(self):
4949
# assert
5050
self.assertEqual(1, Task.objects.filter(task_type=TaskType.ONCE).count())
5151
self.assertEqual(1, Task.objects.filter(task_type=TaskType.REPEATABLE).count())
52-
db_job = Task.objects.filter(task_type=TaskType.ONCE).first()
52+
task = Task.objects.filter(task_type=TaskType.ONCE).first()
5353
attrs = ["name", "queue", "callable", "enabled", "timeout"]
5454
for attr in attrs:
55-
self.assertEqual(getattr(tasks[0], attr), getattr(db_job, attr))
55+
self.assertEqual(getattr(tasks[0], attr), getattr(task, attr))
5656

5757
def test_import__should_schedule_job_yaml_without_yaml_lib(self):
58-
jobs = list()
59-
jobs.append(task_factory(TaskType.ONCE, enabled=True, instance_only=True))
60-
jobs.append(task_factory(TaskType.REPEATABLE, enabled=True, instance_only=True))
61-
res = yaml.dump([j.to_dict() for j in jobs], default_flow_style=False)
58+
tasks = list()
59+
tasks.append(task_factory(TaskType.ONCE, enabled=True, instance_only=True))
60+
tasks.append(task_factory(TaskType.REPEATABLE, enabled=True, instance_only=True))
61+
res = yaml.dump([j.to_dict() for j in tasks], default_flow_style=False)
6262
self.tmpfile.write(res)
6363
self.tmpfile.flush()
6464
# act
@@ -68,27 +68,27 @@ def test_import__should_schedule_job_yaml_without_yaml_lib(self):
6868
self.assertEqual(cm.exception.code, 1)
6969

7070
def test_import__should_schedule_job_reset(self):
71-
jobs = list()
71+
tasks = list()
7272
task_factory(TaskType.ONCE, enabled=True)
7373
task_factory(TaskType.ONCE, enabled=True)
74-
jobs.append(task_factory(TaskType.ONCE, enabled=True))
75-
jobs.append(task_factory(TaskType.REPEATABLE, enabled=True, instance_only=True))
76-
res = json.dumps([j.to_dict() for j in jobs])
74+
tasks.append(task_factory(TaskType.ONCE, enabled=True))
75+
tasks.append(task_factory(TaskType.REPEATABLE, enabled=True, instance_only=True))
76+
res = json.dumps([j.to_dict() for j in tasks])
7777
self.tmpfile.write(res)
7878
self.tmpfile.flush()
7979
# act
8080
call_command("import", filename=self.tmpfile.name, reset=True)
8181
# assert
8282
self.assertEqual(1, Task.objects.filter(task_type=TaskType.ONCE).count())
83-
db_job = Task.objects.filter(task_type=TaskType.ONCE).first()
83+
task = Task.objects.filter(task_type=TaskType.ONCE).first()
8484
attrs = ["name", "queue", "callable", "enabled", "timeout"]
8585
for attr in attrs:
86-
self.assertEqual(getattr(jobs[0], attr), getattr(db_job, attr))
86+
self.assertEqual(getattr(tasks[0], attr), getattr(task, attr))
8787
self.assertEqual(1, Task.objects.filter(task_type=TaskType.REPEATABLE).count())
88-
db_job = Task.objects.filter(task_type=TaskType.REPEATABLE).first()
88+
task = Task.objects.filter(task_type=TaskType.REPEATABLE).first()
8989
attrs = ["name", "queue", "callable", "enabled", "timeout"]
9090
for attr in attrs:
91-
self.assertEqual(getattr(jobs[1], attr), getattr(db_job, attr))
91+
self.assertEqual(getattr(tasks[1], attr), getattr(task, attr))
9292

9393
def test_import__should_schedule_job_update_existing(self):
9494
tasks = list()
@@ -101,10 +101,10 @@ def test_import__should_schedule_job_update_existing(self):
101101
call_command("import", filename=self.tmpfile.name, update=True)
102102
# assert
103103
self.assertEqual(2, Task.objects.filter(task_type=TaskType.ONCE).count())
104-
db_job = Task.objects.filter(task_type=TaskType.ONCE).get(name=tasks[0].name)
104+
task = Task.objects.filter(task_type=TaskType.ONCE).get(name=tasks[0].name)
105105
attrs = ["name", "queue", "callable", "enabled", "timeout"]
106106
for attr in attrs:
107-
self.assertEqual(getattr(tasks[0], attr), getattr(db_job, attr))
107+
self.assertEqual(getattr(tasks[0], attr), getattr(task, attr))
108108

109109
def test_import__should_schedule_job_without_update_existing(self):
110110
tasks = list()
@@ -117,7 +117,7 @@ def test_import__should_schedule_job_without_update_existing(self):
117117
call_command("import", filename=self.tmpfile.name)
118118
# assert
119119
self.assertEqual(2, Task.objects.filter(task_type=TaskType.ONCE).count())
120-
db_job = Task.objects.get(name=tasks[0].name)
120+
task = Task.objects.get(name=tasks[0].name)
121121
attrs = ["id", "name", "queue", "callable", "enabled", "timeout"]
122122
for attr in attrs:
123-
self.assertEqual(getattr(tasks[0], attr), getattr(db_job, attr))
123+
self.assertEqual(getattr(tasks[0], attr), getattr(task, attr))

‎scheduler/tests/test_task_types/test_once_task.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ class TestScheduledTask(BaseTestCases.TestSchedulableTask):
1414
queue_name = settings.get_queue_names()[0]
1515

1616
def test_clean(self):
17-
job = task_factory(self.task_type)
18-
job.queue = self.queue_name
19-
job.callable = "scheduler.tests.jobs.test_job"
20-
self.assertIsNone(job.clean())
17+
task = task_factory(self.task_type)
18+
task.queue = self.queue_name
19+
task.callable = "scheduler.tests.jobs.test_job"
20+
self.assertIsNone(task.clean())
2121

2222
def test_create_without_date__fail(self):
2323
task = task_factory(self.task_type, scheduled_time=None, instance_only=True)
@@ -35,5 +35,5 @@ def test_create_with_date_in_the_past__fail(self):
3535
self.assertEqual(str(cm.exception), "{'scheduled_time': ['Scheduled time must be in the future']}")
3636

3737
def test_unschedulable_old_job(self):
38-
job = task_factory(self.task_type, scheduled_time=timezone.now() - timedelta(hours=1))
39-
self.assertFalse(job.is_scheduled())
38+
task = task_factory(self.task_type, scheduled_time=timezone.now() - timedelta(hours=1))
39+
self.assertFalse(task.is_scheduled())

‎scheduler/tests/test_task_types/test_repeatable_task.py

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -52,41 +52,41 @@ def test_create_task_without_scheduled_time(self):
5252
self.assertEqual(task.interval_unit, "seconds")
5353

5454
def test_unschedulable_old_job(self):
55-
job = task_factory(self.task_type, scheduled_time=timezone.now() - timedelta(hours=1), repeat=0)
56-
self.assertFalse(job.is_scheduled())
55+
task = task_factory(self.task_type, scheduled_time=timezone.now() - timedelta(hours=1), repeat=0)
56+
self.assertFalse(task.is_scheduled())
5757

5858
def test_schedulable_old_job_repeat_none(self):
5959
# If repeat is None, the job should be scheduled
60-
job = task_factory(self.task_type, scheduled_time=timezone.now() - timedelta(hours=1), repeat=None)
61-
self.assertTrue(job.is_scheduled())
60+
task = task_factory(self.task_type, scheduled_time=timezone.now() - timedelta(hours=1), repeat=None)
61+
self.assertTrue(task.is_scheduled())
6262

6363
def test_clean(self):
64-
job = task_factory(self.task_type)
65-
job.queue = self.queue_name
66-
job.callable = "scheduler.tests.jobs.test_job"
67-
job.interval = 1
68-
job.success_ttl = -1
69-
self.assertIsNone(job.clean())
64+
task = task_factory(self.task_type)
65+
task.queue = self.queue_name
66+
task.callable = "scheduler.tests.jobs.test_job"
67+
task.interval = 1
68+
task.success_ttl = -1
69+
self.assertIsNone(task.clean())
7070

7171
def test_clean_seconds(self):
72-
job = task_factory(self.task_type)
73-
job.queue = self.queue_name
74-
job.callable = "scheduler.tests.jobs.test_job"
75-
job.interval = 60
76-
job.success_ttl = -1
77-
job.interval_unit = "seconds"
78-
self.assertIsNone(job.clean())
72+
task = task_factory(self.task_type)
73+
task.queue = self.queue_name
74+
task.callable = "scheduler.tests.jobs.test_job"
75+
task.interval = 60
76+
task.success_ttl = -1
77+
task.interval_unit = "seconds"
78+
self.assertIsNone(task.clean())
7979

8080
@override_settings(SCHEDULER_CONFIG=SchedulerConfiguration(SCHEDULER_INTERVAL=10))
8181
def test_clean_too_frequent(self):
82-
job = task_factory(self.task_type)
83-
job.queue = self.queue_name
84-
job.callable = "scheduler.tests.jobs.test_job"
85-
job.interval = 2 # Smaller than 10
86-
job.success_ttl = -1
87-
job.interval_unit = "seconds"
82+
task = task_factory(self.task_type)
83+
task.queue = self.queue_name
84+
task.callable = "scheduler.tests.jobs.test_job"
85+
task.interval = 2 # Smaller than 10
86+
task.success_ttl = -1
87+
task.interval_unit = "seconds"
8888
with self.assertRaises(ValidationError):
89-
job.clean_interval_unit()
89+
task.clean_interval_unit()
9090

9191
def test_clean_short_result_ttl(self):
9292
task = task_factory(self.task_type)
@@ -126,44 +126,44 @@ def test_interval_seconds_days(self):
126126
self.assertEqual(172800.0, task.interval_seconds())
127127

128128
def test_interval_seconds_hours(self):
129-
job = task_factory(self.task_type, interval=2, interval_unit="hours")
130-
self.assertEqual(7200.0, job.interval_seconds())
129+
task = task_factory(self.task_type, interval=2, interval_unit="hours")
130+
self.assertEqual(7200.0, task.interval_seconds())
131131

132132
def test_interval_seconds_minutes(self):
133-
job = task_factory(self.task_type, interval=15, interval_unit="minutes")
134-
self.assertEqual(900.0, job.interval_seconds())
133+
task = task_factory(self.task_type, interval=15, interval_unit="minutes")
134+
self.assertEqual(900.0, task.interval_seconds())
135135

136136
def test_interval_seconds_seconds(self):
137-
job = task_factory(self.task_type, interval=15, interval_unit="seconds")
138-
self.assertEqual(15.0, job.interval_seconds())
137+
task = task_factory(self.task_type, interval=15, interval_unit="seconds")
138+
self.assertEqual(15.0, task.interval_seconds())
139139

140140
def test_result_interval(self):
141-
job = task_factory(self.task_type)
142-
entry = _get_task_scheduled_job_from_registry(job)
141+
task = task_factory(self.task_type)
142+
entry = _get_task_scheduled_job_from_registry(task)
143143
self.assertEqual(entry.meta["interval"], 3600)
144144

145145
def test_repeat(self):
146-
job = task_factory(self.task_type, repeat=10)
147-
entry = _get_task_scheduled_job_from_registry(job)
146+
task = task_factory(self.task_type, repeat=10)
147+
entry = _get_task_scheduled_job_from_registry(task)
148148
self.assertEqual(entry.meta["repeat"], 10)
149149

150150
def test_repeat_old_job_exhausted(self):
151151
base_time = timezone.now()
152-
job = task_factory(self.task_type, scheduled_time=base_time - timedelta(hours=10), repeat=10)
153-
self.assertEqual(job.is_scheduled(), False)
152+
task = task_factory(self.task_type, scheduled_time=base_time - timedelta(hours=10), repeat=10)
153+
self.assertEqual(task.is_scheduled(), False)
154154

155155
def test_repeat_old_job_last_iter(self):
156156
base_time = timezone.now()
157-
job = task_factory(self.task_type, scheduled_time=base_time - timedelta(hours=9, minutes=30), repeat=10)
158-
self.assertEqual(job.repeat, 0)
159-
self.assertEqual(job.is_scheduled(), True)
157+
task = task_factory(self.task_type, scheduled_time=base_time - timedelta(hours=9, minutes=30), repeat=10)
158+
self.assertEqual(task.repeat, 0)
159+
self.assertEqual(task.is_scheduled(), True)
160160

161161
def test_repeat_old_job_remaining(self):
162162
base_time = timezone.now()
163-
job = task_factory(self.task_type, scheduled_time=base_time - timedelta(minutes=30), repeat=5)
164-
self.assertEqual(job.repeat, 4)
165-
self.assertEqual(job.scheduled_time, base_time + timedelta(minutes=30))
166-
self.assertEqual(job.is_scheduled(), True)
163+
task = task_factory(self.task_type, scheduled_time=base_time - timedelta(minutes=30), repeat=5)
164+
self.assertEqual(task.repeat, 4)
165+
self.assertEqual(task.scheduled_time, base_time + timedelta(minutes=30))
166+
self.assertEqual(task.is_scheduled(), True)
167167

168168
def test_repeat_none_interval_2_min(self):
169169
base_time = timezone.now()

‎scheduler/tests/test_task_types/test_task_model.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -224,13 +224,13 @@ def test_parse_args(self):
224224
self.assertEqual(task.parse_args(), ["one", 2, True, False, date])
225225

226226
def test_parse_kwargs(self):
227-
job = task_factory(self.task_type)
227+
task = task_factory(self.task_type)
228228
date = timezone.now()
229-
taskarg_factory(TaskKwarg, key="key1", arg_type="str", val="one", content_object=job)
230-
taskarg_factory(TaskKwarg, key="key2", arg_type="int", val=2, content_object=job)
231-
taskarg_factory(TaskKwarg, key="key3", arg_type="bool", val=True, content_object=job)
232-
taskarg_factory(TaskKwarg, key="key4", arg_type="datetime", val=date, content_object=job)
233-
kwargs = job.parse_kwargs()
229+
taskarg_factory(TaskKwarg, key="key1", arg_type="str", val="one", content_object=task)
230+
taskarg_factory(TaskKwarg, key="key2", arg_type="int", val=2, content_object=task)
231+
taskarg_factory(TaskKwarg, key="key3", arg_type="bool", val=True, content_object=task)
232+
taskarg_factory(TaskKwarg, key="key4", arg_type="datetime", val=date, content_object=task)
233+
kwargs = task.parse_kwargs()
234234
self.assertEqual(kwargs, dict(key1="one", key2=2, key3=True, key4=date))
235235

236236
def test_callable_args_and_kwargs(self):
@@ -494,6 +494,6 @@ def test_schedule_time_with_tz(self):
494494
self.assertEqual("2016-12-25T13:00:00+00:00", task._schedule_time().isoformat())
495495

496496
def test_result_ttl_passthrough(self):
497-
job = task_factory(self.task_type, result_ttl=500)
498-
entry = _get_task_scheduled_job_from_registry(job)
497+
task = task_factory(self.task_type, result_ttl=500)
498+
entry = _get_task_scheduled_job_from_registry(task)
499499
self.assertEqual(entry.success_ttl, 500)

‎scheduler/tests/test_views/test_job_details.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ def test_job_details(self):
3636

3737
def test_scheduled_job_details(self):
3838
"""Job data is displayed properly"""
39-
scheduled_job = task_factory(TaskType.ONCE, enabled=True)
40-
job = _get_task_scheduled_job_from_registry(scheduled_job)
39+
task = task_factory(TaskType.ONCE, enabled=True)
40+
job = _get_task_scheduled_job_from_registry(task)
4141

4242
url = reverse(
4343
"job_details",

0 commit comments

Comments
 (0)