Skip to content

Commit a04cd6f

Browse files
fix: updated artifact fetch for taskgraph 19 compatibility
1 parent e7e11f2 commit a04cd6f

2 files changed

Lines changed: 20 additions & 21 deletions

File tree

test/actions/test_release_promotion.py

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -49,25 +49,22 @@ def inner(previous_graphs=None):
4949
)
5050

5151
# Only the parameters from the first previous graph is downloaded.
52-
responses.add(
53-
method="GET",
54-
url=f"{tc_url}/api/queue/v1/task/{list(previous_graphs.keys())[0]}/artifacts/public%2Fparameters.yml",
55-
json=parameters,
56-
)
52+
# get_artifact does a two-step fetch: getLatestArtifact returns
53+
# {"url": url}, then the content is fetched from that url.
54+
url = f"{tc_url}/api/queue/v1/task/{list(previous_graphs.keys())[0]}/artifacts/public%2Fparameters.yml"
55+
responses.add(method="GET", url=url, json={"url": url})
56+
responses.add(method="GET", url=url, json=parameters)
5757

5858
tid = count(0)
5959
for decision_id, full_task_graph in previous_graphs.items():
60-
responses.add(
61-
method="GET",
62-
url=f"{tc_url}/api/queue/v1/task/{decision_id}/artifacts/public%2Ffull-task-graph.json",
63-
json=full_task_graph.to_json(),
64-
)
60+
url = f"{tc_url}/api/queue/v1/task/{decision_id}/artifacts/public%2Ffull-task-graph.json"
61+
responses.add(method="GET", url=url, json={"url": url})
62+
responses.add(method="GET", url=url, json=full_task_graph.to_json())
63+
6564
label_to_taskid = {label: int(next(tid)) for label in full_task_graph.tasks}
66-
responses.add(
67-
method="GET",
68-
url=f"{tc_url}/api/queue/v1/task/{decision_id}/artifacts/public%2Flabel-to-taskid.json",
69-
json=label_to_taskid,
70-
)
65+
url = f"{tc_url}/api/queue/v1/task/{decision_id}/artifacts/public%2Flabel-to-taskid.json"
66+
responses.add(method="GET", url=url, json={"url": url})
67+
responses.add(method="GET", url=url, json=label_to_taskid)
7168

7269
return inner
7370

test/transforms/test_replicate.py

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -214,10 +214,11 @@ def test_decision_task(responses, run_replicate):
214214
expected = get_expected(prefix, *task_defs)
215215

216216
counter = count()
217-
responses.get(
218-
f"{TC_ROOT_URL}/api/queue/v1/task/{task_id}/artifacts/public%2Ftask-graph.json",
219-
json={next(counter): task_def for task_def in task_defs},
217+
url = (
218+
f"{TC_ROOT_URL}/api/queue/v1/task/{task_id}/artifacts/public%2Ftask-graph.json"
220219
)
220+
responses.get(url, json={"url": url})
221+
responses.get(url, json={next(counter): task_def for task_def in task_defs})
221222
result = run_replicate(task)
222223
assert result == expected
223224

@@ -269,9 +270,10 @@ def test_filtered_out(responses, run_replicate, target_def):
269270
task_defs = get_target_defs(target_def)
270271

271272
counter = count()
272-
responses.get(
273-
f"{TC_ROOT_URL}/api/queue/v1/task/{task_id}/artifacts/public%2Ftask-graph.json",
274-
json={next(counter): task_def for task_def in task_defs},
273+
url = (
274+
f"{TC_ROOT_URL}/api/queue/v1/task/{task_id}/artifacts/public%2Ftask-graph.json"
275275
)
276+
responses.get(url, json={"url": url})
277+
responses.get(url, json={next(counter): task_def for task_def in task_defs})
276278
result = run_replicate(task)
277279
assert len(result) == 0

0 commit comments

Comments
 (0)