summaryrefslogtreecommitdiff
path: root/tests/artifactcache
diff options
context:
space:
mode:
authorTristan Van Berkom <tristan.vanberkom@codethink.co.uk>2018-05-02 15:30:20 +0900
committerTristan Van Berkom <tristan.vanberkom@codethink.co.uk>2018-05-08 03:59:38 +0900
commitb8e15706a51272e4f4e116d9e373fd2581102868 (patch)
tree25518bb2f60418749a32418c3523a19c11e232e6 /tests/artifactcache
parenta542c81858d94e0be06216184f3df61600805138 (diff)
downloadbuildstream-b8e15706a51272e4f4e116d9e373fd2581102868.tar.gz
_artifactcache: Added ArtifactCache.setup_remotes()
This removes some additional initialization code from Pipeline(). Some symbols have changed here, the initialization is now called from Stream(), and a test case was also adjusted for this.
Diffstat (limited to 'tests/artifactcache')
-rw-r--r--tests/artifactcache/config.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/artifactcache/config.py b/tests/artifactcache/config.py
index 690e354f5..079e511ef 100644
--- a/tests/artifactcache/config.py
+++ b/tests/artifactcache/config.py
@@ -3,7 +3,8 @@ import pytest
import itertools
import os
-from buildstream._artifactcache import ArtifactCacheSpec, configured_remote_artifact_cache_specs
+from buildstream._artifactcache import ArtifactCacheSpec
+from buildstream._artifactcache.artifactcache import _configured_remote_artifact_cache_specs
from buildstream._context import Context
from buildstream._project import Project
from buildstream.utils import _deduplicate
@@ -99,7 +100,7 @@ def test_artifact_cache_precedence(tmpdir, override_caches, project_caches, user
project = Project(str(project_dir), context)
# Use the helper from the artifactcache module to parse our configuration.
- parsed_cache_specs = configured_remote_artifact_cache_specs(context, project)
+ parsed_cache_specs = _configured_remote_artifact_cache_specs(context, project)
# Verify that it was correctly read.
expected_cache_specs = list(_deduplicate(itertools.chain(override_caches, project_caches, user_caches)))