@@ -150,7 +150,11 @@ async def test_fetch_selects_eligible_jobs_and_sets_lock_fields(
150150 project = await create_project (session = session )
151151 user = await create_user (session = session )
152152 repo = await create_repo (session = session , project_id = project .id )
153- run = await create_run (session = session , project = project , repo = repo , user = user )
153+ fleet = await create_fleet (session = session , project = project )
154+ run = await create_run (session = session , project = project , repo = repo , user = user , fleet = fleet )
155+ run_without_fleet = await create_run (
156+ session = session , project = project , repo = repo , user = user
157+ )
154158 now = get_current_datetime ()
155159 stale = now - timedelta (minutes = 1 )
156160
@@ -190,6 +194,15 @@ async def test_fetch_selects_eligible_jobs_and_sets_lock_fields(
190194 waiting_master_job = True ,
191195 job_num = 3 ,
192196 )
197+ waiting_run_fleet = await create_job (
198+ session = session ,
199+ run = run_without_fleet ,
200+ status = JobStatus .SUBMITTED ,
201+ submitted_at = stale - timedelta (minutes = 3 ),
202+ last_processed_at = stale - timedelta (seconds = 3 ),
203+ waiting_master_job = True ,
204+ job_num = 3 ,
205+ )
193206 recent_retry = await create_job (
194207 session = session ,
195208 run = run ,
@@ -221,6 +234,7 @@ async def test_fetch_selects_eligible_jobs_and_sets_lock_fields(
221234 provisioning_job ,
222235 fresh_job ,
223236 waiting_master ,
237+ waiting_run_fleet ,
224238 recent_retry ,
225239 foreign_locked ,
226240 ]:
@@ -233,6 +247,7 @@ async def test_fetch_selects_eligible_jobs_and_sets_lock_fields(
233247 assert len ({job .lock_token for job in fetched_jobs }) == 1
234248
235249 assert waiting_master .lock_owner is None
250+ assert waiting_run_fleet .lock_owner is None
236251 assert recent_retry .lock_owner is None
237252 assert foreign_locked .lock_owner == "OtherPipeline"
238253
@@ -278,7 +293,6 @@ async def test_fetch_orders_by_priority_then_last_processed_at(
278293 run = high_priority_run ,
279294 submitted_at = now - timedelta (minutes = 5 ),
280295 last_processed_at = now - timedelta (minutes = 2 , seconds = 30 ),
281- job_num = 1 ,
282296 )
283297
284298 items = await fetcher .fetch (limit = 3 )
@@ -310,14 +324,12 @@ async def test_fetch_retries_expired_same_owner_lock_and_respects_limit(
310324 run = run ,
311325 submitted_at = stale - timedelta (minutes = 1 ),
312326 last_processed_at = stale - timedelta (seconds = 1 ),
313- job_num = 1 ,
314327 )
315328 newest = await create_job (
316329 session = session ,
317330 run = run ,
318331 submitted_at = stale ,
319332 last_processed_at = stale ,
320- job_num = 2 ,
321333 )
322334 _lock_job_expired_same_owner (expired_same_owner )
323335 await session .commit ()
0 commit comments