Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 02:14:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1659187 - [taskgraph.test] Automatically set dependencies based on edges in test_optimize.py, r=taskgraph-reviewers,bhearsum

Browse Source 
Edges are defined as a (left, right, name) tuple, which means task left depends on task right using an edge called name. Previously the optimization code never took dependencies into account, so the mock graph generator never bothered to create them. But in the child revision, we start using these values, so the generation should set it up appropriately.

I had to make it conditional due to the way the assertions in the test_get_subgraph test are set up. I figured it was easier to do that than to re-write the assertions.

Depends on D88483

Differential Revision: https://phabricator.services.mozilla.com/D88484
This commit is contained in:
Andrew Halberstadt 2020-08-28 12:28:04 +00:00
parent 59d997abe4
commit 18cca882f7
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
taskcluster/taskgraph/test/test_optimize.py
View File

@ -51,10 +51,17 @@ def make_task(
return task
def make_graph(*tasks_and_edges):
def make_graph(*tasks_and_edges, **kwargs):
tasks = {t.label: t for t in tasks_and_edges if isinstance(t, Task)}
edges = {e for e in tasks_and_edges if not isinstance(e, Task)}
return TaskGraph(tasks, graph.Graph(set(tasks), edges))
tg = TaskGraph(tasks, graph.Graph(set(tasks), edges))
if kwargs.get("deps", True):
# set dependencies based on edges
for l, r, name in tg.graph.edges:
tg.tasks[l].dependencies[name] = r
return tg
def make_opt_graph(*tasks_and_edges):
@ -63,7 +70,7 @@ def make_opt_graph(*tasks_and_edges):
return TaskGraph(tasks, graph.Graph(set(tasks), edges))
def make_triangle(**opts):
def make_triangle(deps=True, **opts):
"""
Make a "triangle" graph like this:
@ -77,6 +84,7 @@ def make_triangle(**opts):
('t3', 't2', 'dep'),
('t3', 't1', 'dep2'),
('t2', 't1', 'dep'),
deps=deps
)
@ -296,7 +304,7 @@ def test_replace_tasks(
(
# Test get_subgraph returns a similarly-shaped subgraph when nothing is removed
pytest.param(
make_triangle(),
make_triangle(deps=False),
{},
make_opt_graph(
make_task('t1', task_id='tid1', dependencies={}),
@ -312,7 +320,7 @@ def test_replace_tasks(
# Test get_subgraph returns a smaller subgraph when tasks are removed
pytest.param(
make_triangle(),
make_triangle(deps=False),
{
"removed_tasks": {"t2", "t3"},
},
@ -326,7 +334,7 @@ def test_replace_tasks(
# Test get_subgraph returns a smaller subgraph when tasks are replaced
pytest.param(
make_triangle(),
make_triangle(deps=False),
{
"replaced_tasks": {"t1", "t2"},
"label_to_taskid": {"t1": "e1", "t2": "e2"},