@@ -269,19 +269,20 @@ def test_remove_tasks(monkeypatch, graph, kwargs, exp_removed):
269269
270270
271271@pytest .mark .parametrize (
272- "graph,kwargs,exp_replaced,exp_removed,exp_label_to_taskid " ,
272+ "graph,kwargs,exp_replaced,exp_removed" ,
273273 (
274274 # A task cannot be replaced if it depends on one that was not replaced
275275 pytest .param (
276276 make_triangle (
277277 t1 = {"replace" : "e1" },
278278 t3 = {"replace" : "e3" },
279279 ),
280- {},
280+ {
281+ "index_to_taskid" : {"t1" : "e1" },
282+ },
281283 # expectations
282284 {"t1" },
283285 set (),
284- {"t1" : "e1" },
285286 id = "blocked" ,
286287 ),
287288 # A task cannot be replaced if it should not be optimized
@@ -291,11 +292,13 @@ def test_remove_tasks(monkeypatch, graph, kwargs, exp_removed):
291292 t2 = {"replace" : "xxx" }, # but do_not_optimize
292293 t3 = {"replace" : "e3" },
293294 ),
294- {"do_not_optimize" : {"t2" }},
295+ {
296+ "do_not_optimize" : {"t2" },
297+ "index_to_taskid" : {"t1" : "e1" },
298+ },
295299 # expectations
296300 {"t1" },
297301 set (),
298- {"t1" : "e1" },
299302 id = "do_not_optimize" ,
300303 ),
301304 # No tasks are replaced when strategy is 'never'
@@ -305,7 +308,6 @@ def test_remove_tasks(monkeypatch, graph, kwargs, exp_removed):
305308 # expectations
306309 set (),
307310 set (),
308- {},
309311 id = "never" ,
310312 ),
311313 # All replaceable tasks are replaced when strategy is 'replace'
@@ -315,11 +317,12 @@ def test_remove_tasks(monkeypatch, graph, kwargs, exp_removed):
315317 t2 = {"replace" : "e2" },
316318 t3 = {"replace" : "e3" },
317319 ),
318- {},
320+ {
321+ "index_to_taskid" : {"t1" : "e1" , "t2" : "e2" , "t3" : "e3" },
322+ },
319323 # expectations
320324 {"t1" , "t2" , "t3" },
321325 set (),
322- {"t1" : "e1" , "t2" : "e2" , "t3" : "e3" },
323326 id = "all" ,
324327 ),
325328 # A task can be replaced with nothing
@@ -329,11 +332,12 @@ def test_remove_tasks(monkeypatch, graph, kwargs, exp_removed):
329332 t2 = {"replace" : True },
330333 t3 = {"replace" : True },
331334 ),
332- {},
335+ {
336+ "index_to_taskid" : {"t1" : "e1" },
337+ },
333338 # expectations
334339 {"t1" },
335340 {"t2" , "t3" },
336- {"t1" : "e1" },
337341 id = "tasks_removed" ,
338342 ),
339343 # A task which expires before a dependents deadline is not a valid replacement.
@@ -353,7 +357,6 @@ def test_remove_tasks(monkeypatch, graph, kwargs, exp_removed):
353357 # expectations
354358 set (),
355359 set (),
356- {},
357360 id = "deadline" ,
358361 ),
359362 ),
@@ -363,7 +366,6 @@ def test_replace_tasks(
363366 kwargs ,
364367 exp_replaced ,
365368 exp_removed ,
366- exp_label_to_taskid ,
367369):
368370 """Tests the `replace_tasks` function.
369371
@@ -378,6 +380,8 @@ def test_replace_tasks(
378380 kwargs .setdefault ("params" , {})
379381 kwargs .setdefault ("do_not_optimize" , set ())
380382 kwargs .setdefault ("label_to_taskid" , {})
383+ kwargs .setdefault ("index_to_taskid" , {})
384+ kwargs .setdefault ("taskid_to_status" , {})
381385 kwargs .setdefault ("removed_tasks" , set ())
382386 kwargs .setdefault ("existing_tasks" , {})
383387
@@ -388,7 +392,6 @@ def test_replace_tasks(
388392 )
389393 assert got_replaced == exp_replaced
390394 assert kwargs ["removed_tasks" ] == exp_removed
391- assert kwargs ["label_to_taskid" ] == exp_label_to_taskid
392395
393396
394397@pytest .mark .parametrize (
0 commit comments