File tree Expand file tree Collapse file tree 3 files changed +16
-3
lines changed Expand file tree Collapse file tree 3 files changed +16
-3
lines changed Original file line number Diff line number Diff line change 1
1
# -*- coding: utf-8 -*-
2
- # Generated by Django 1.11 on 2018-04-26 10:24
2
+ # Generated by Django 1.11 on 2018-07-13 10:00
3
3
from __future__ import unicode_literals
4
4
5
5
from django .db import migrations , models
@@ -19,6 +19,6 @@ class Migration(migrations.Migration):
19
19
migrations .AddField (
20
20
model_name = 'job' ,
21
21
name = 'priority' ,
22
- field = models .PositiveSmallIntegerField (db_index = True , default = 0 ),
22
+ field = models .SmallIntegerField (db_index = True , default = 0 ),
23
23
),
24
24
]
Original file line number Diff line number Diff line change @@ -71,7 +71,7 @@ class Job(models.Model):
71
71
next_task = models .CharField (max_length = 100 , blank = True )
72
72
workspace = JSONField (null = True )
73
73
queue_name = models .CharField (max_length = 20 , default = 'default' , db_index = True )
74
- priority = models .PositiveSmallIntegerField (default = 0 , db_index = True )
74
+ priority = models .SmallIntegerField (default = 0 , db_index = True )
75
75
76
76
class Meta :
77
77
ordering = ['-priority' , 'created' ]
Original file line number Diff line number Diff line change @@ -113,6 +113,19 @@ def test_gets_jobs_in_priority_order(self):
113
113
self .assertEqual (Job .objects .get_ready_or_none ('default' ), job_3 )
114
114
self .assertFalse (Job .objects .to_process ('default' ).filter (id = job_2 .id ).exists ())
115
115
116
+ def test_gets_jobs_in_negative_priority_order (self ):
117
+ job_1 = Job .objects .create (name = 'testjob' )
118
+ job_2 = Job .objects .create (name = 'testjob' , state = Job .STATES .PROCESSING )
119
+ job_3 = Job .objects .create (name = 'testjob' , priority = - 2 )
120
+ job_4 = Job .objects .create (name = 'testjob' , priority = 1 )
121
+ self .assertEqual ({
122
+ job for job in Job .objects .to_process ('default' )
123
+ }, {
124
+ job_4 , job_3 , job_1
125
+ })
126
+ self .assertEqual (Job .objects .get_ready_or_none ('default' ), job_4 )
127
+ self .assertFalse (Job .objects .to_process ('default' ).filter (id = job_2 .id ).exists ())
128
+
116
129
def test_gets_jobs_in_priority_and_date_order (self ):
117
130
job_1 = Job .objects .create (name = 'testjob' , priority = 3 )
118
131
job_2 = Job .objects .create (name = 'testjob' , state = Job .STATES .PROCESSING , priority = 3 )
You can’t perform that action at this time.
0 commit comments