@@ -52,41 +52,41 @@ def test_create_task_without_scheduled_time(self):
52
52
self .assertEqual (task .interval_unit , "seconds" )
53
53
54
54
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 ())
57
57
58
58
def test_schedulable_old_job_repeat_none (self ):
59
59
# 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 ())
62
62
63
63
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 ())
70
70
71
71
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 ())
79
79
80
80
@override_settings (SCHEDULER_CONFIG = SchedulerConfiguration (SCHEDULER_INTERVAL = 10 ))
81
81
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"
88
88
with self .assertRaises (ValidationError ):
89
- job .clean_interval_unit ()
89
+ task .clean_interval_unit ()
90
90
91
91
def test_clean_short_result_ttl (self ):
92
92
task = task_factory (self .task_type )
@@ -126,44 +126,44 @@ def test_interval_seconds_days(self):
126
126
self .assertEqual (172800.0 , task .interval_seconds ())
127
127
128
128
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 ())
131
131
132
132
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 ())
135
135
136
136
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 ())
139
139
140
140
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 )
143
143
self .assertEqual (entry .meta ["interval" ], 3600 )
144
144
145
145
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 )
148
148
self .assertEqual (entry .meta ["repeat" ], 10 )
149
149
150
150
def test_repeat_old_job_exhausted (self ):
151
151
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 )
154
154
155
155
def test_repeat_old_job_last_iter (self ):
156
156
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 )
160
160
161
161
def test_repeat_old_job_remaining (self ):
162
162
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 )
167
167
168
168
def test_repeat_none_interval_2_min (self ):
169
169
base_time = timezone .now ()
0 commit comments