diff options
| author | Angelos Evripiotis <jevripiotis@bloomberg.net> | 2019-03-13 14:46:53 +0000 |
|---|---|---|
| committer | bst-marge-bot <marge-bot@buildstream.build> | 2019-03-21 15:58:17 +0000 |
| commit | 7d458be19e26cfd7ef3ac682cf864044bb1e9d56 (patch) | |
| tree | a9f8aa10f02369b8f34a7deccb37288b1a30b94c | |
| parent | 7b8c730e53326c89386ffc661a0200df2706e29f (diff) | |
| download | buildstream-7d458be19e26cfd7ef3ac682cf864044bb1e9d56.tar.gz | |
_artifactcache: don't define CACHE_SIZE_FILE twice
No need to define CACHE_SIZE_FILE in _artifactcache, it is not used here
by the main application, and it is already defined and used in
_cas.cascache.
Fixup the reference in tests to refer to _cas.cascache instead.
| -rw-r--r-- | buildstream/_artifactcache.py | 3 | ||||
| -rw-r--r-- | tests/artifactcache/cache_size.py | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/buildstream/_artifactcache.py b/buildstream/_artifactcache.py index 49f07cb50..11aa4bc1b 100644 --- a/buildstream/_artifactcache.py +++ b/buildstream/_artifactcache.py @@ -25,9 +25,6 @@ from ._cas import CASRemoteSpec from .storage._casbaseddirectory import CasBasedDirectory -CACHE_SIZE_FILE = "cache_size" - - # An ArtifactCacheSpec holds the user configuration for a single remote # artifact cache. # diff --git a/tests/artifactcache/cache_size.py b/tests/artifactcache/cache_size.py index 104c43ce0..c6ba15794 100644 --- a/tests/artifactcache/cache_size.py +++ b/tests/artifactcache/cache_size.py @@ -2,7 +2,7 @@ import os from unittest import mock from buildstream import _yaml -from buildstream._artifactcache import CACHE_SIZE_FILE +from buildstream._cas.cascache import CACHE_SIZE_FILE from buildstream._exceptions import ErrorDomain from buildstream.plugintestutils import cli |