From 17144d84c2b63daf6e3aa9b42c6c773f134e8660 Mon Sep 17 00:00:00 2001 From: Tristan Maat Date: Wed, 18 Sep 2019 17:55:19 +0100 Subject: testutils/context.py: Mock tasks instead of accepting Nones To ensure that we only disable element loading task progress reporting for very specific code paths, we need to teach the test suite to be a bit smarter. For this reason we now mock a _Task object and return it in our mock context's relevant method invocations. Other code paths that deliberately invoke the loader without task reporting now mark their loads with NO_PROGRESS. --- src/buildstream/_project.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/buildstream/_project.py') diff --git a/src/buildstream/_project.py b/src/buildstream/_project.py index 6ae8aa9db..7ba93bba4 100644 --- a/src/buildstream/_project.py +++ b/src/buildstream/_project.py @@ -433,7 +433,7 @@ class Project(): # def load_elements(self, targets, *, rewritable=False): with self._context.messenger.simple_task("Loading elements", silent_nested=True) as task: - meta_elements = self.loader.load(targets, rewritable=rewritable, ticker=None, task=task) + meta_elements = self.loader.load(targets, task, rewritable=rewritable, ticker=None) with self._context.messenger.simple_task("Resolving elements") as task: if task: -- cgit v1.2.1