[buildstream] 01/01: tests/artifactcache/config.py: Fix parallel test bug

[ju...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

juergbi pushed a commit to branch juerg/parallel-test
in repository https://gitbox.apache.org/repos/asf/buildstream.git

commit 657d3b0aaf0aa6d0c0926b8f578f949ee8f5483c
Author: Jürg Billeter <j...@bitron.ch>
AuthorDate: Wed May 12 10:57:04 2021 +0200

    tests/artifactcache/config.py: Fix parallel test bug
    
    Move all BuildStream directories into the test-specific `tmpdir` in
    `test_artifact_cache_precedence` to avoid the same directory being used
    at the same time by multiple tests.
---
 tests/artifactcache/config.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/artifactcache/config.py b/tests/artifactcache/config.py
index 5223485..6810911 100644
--- a/tests/artifactcache/config.py
+++ b/tests/artifactcache/config.py
@@ -11,6 +11,7 @@ from buildstream.utils import _deduplicate
 from buildstream import _yaml
 from buildstream.exceptions import ErrorDomain, LoadErrorReason
 
+from buildstream.testing import runcli
 from buildstream.testing.runcli import cli  # pylint: disable=unused-import
 
 from tests.testutils import dummy_context
@@ -94,14 +95,13 @@ def test_artifact_cache_precedence(tmpdir, override_caches, project_caches, user
     project_config["name"] = "test"
     project_config["min-version"] = "2.0"
 
-    user_config_file = str(tmpdir.join("buildstream.conf"))
-    _yaml.roundtrip_dump(user_config, file=user_config_file)
-
     project_dir = tmpdir.mkdir("project")
     project_config_file = str(project_dir.join("project.conf"))
     _yaml.roundtrip_dump(project_config, file=project_config_file)
 
-    with dummy_context(config=user_config_file) as context:
+    with runcli.configured(str(tmpdir), user_config) as user_config_file, dummy_context(
+        config=user_config_file
+    ) as context:
         project = Project(str(project_dir), context)
         project.ensure_fully_loaded()