summaryrefslogtreecommitdiff
path: root/tests/artifactcache
diff options
context:
space:
mode:
authorTristan Maat <tristan.maat@codethink.co.uk>2019-08-19 12:31:48 +0100
committerTristan Maat <tristan.maat@codethink.co.uk>2019-09-06 14:32:21 +0100
commite28db2335208906490d759780d091c3709da131e (patch)
treeaefc4fe93f2f89327d5b27267b9ce5682002ec9e /tests/artifactcache
parent412da4061d0d95513e3b4b13fc1c64a8c5d8cd21 (diff)
downloadbuildstream-e28db2335208906490d759780d091c3709da131e.tar.gz
Remove cache-specifc spec classes
This was almost entirely just historical code duplication.
Diffstat (limited to 'tests/artifactcache')
-rw-r--r--tests/artifactcache/config.py15
1 files changed, 8 insertions, 7 deletions
diff --git a/tests/artifactcache/config.py b/tests/artifactcache/config.py
index 08d6f74bb..2f235f38c 100644
--- a/tests/artifactcache/config.py
+++ b/tests/artifactcache/config.py
@@ -6,7 +6,8 @@ import os
import pytest
-from buildstream._artifactcache import ArtifactCacheSpec, ArtifactCache
+from buildstream._remote import RemoteSpec
+from buildstream._artifactcache import ArtifactCache
from buildstream._project import Project
from buildstream.utils import _deduplicate
from buildstream import _yaml
@@ -18,12 +19,12 @@ from tests.testutils import dummy_context
DATA_DIR = os.path.dirname(os.path.realpath(__file__))
-cache1 = ArtifactCacheSpec(url='https://example.com/cache1', push=True)
-cache2 = ArtifactCacheSpec(url='https://example.com/cache2', push=False)
-cache3 = ArtifactCacheSpec(url='https://example.com/cache3', push=False)
-cache4 = ArtifactCacheSpec(url='https://example.com/cache4', push=False)
-cache5 = ArtifactCacheSpec(url='https://example.com/cache5', push=False)
-cache6 = ArtifactCacheSpec(url='https://example.com/cache6', push=True)
+cache1 = RemoteSpec(url='https://example.com/cache1', push=True)
+cache2 = RemoteSpec(url='https://example.com/cache2', push=False)
+cache3 = RemoteSpec(url='https://example.com/cache3', push=False)
+cache4 = RemoteSpec(url='https://example.com/cache4', push=False)
+cache5 = RemoteSpec(url='https://example.com/cache5', push=False)
+cache6 = RemoteSpec(url='https://example.com/cache6', push=True)
# Generate cache configuration fragments for the user config and project config files.