diff options
| author | Jürg Billeter <j@bitron.ch> | 2019-07-17 17:45:24 +0200 |
|---|---|---|
| committer | Jürg Billeter <j@bitron.ch> | 2019-08-20 08:09:52 +0200 |
| commit | 0044e56bbd0f2f3b5c210fd3c04cb5adc7dbcdc6 (patch) | |
| tree | 9540eac7a8ba7c02da70a38e1a5d5201f22ae589 | |
| parent | fdd31d8c2b731dc5d2a55f1d632d7709b6462ae9 (diff) | |
| download | buildstream-0044e56bbd0f2f3b5c210fd3c04cb5adc7dbcdc6.tar.gz | |
_context.py: Pass cache quota to CASCache
| -rw-r--r-- | src/buildstream/_context.py | 2 | ||||
| -rw-r--r-- | tests/artifactcache/expiry.py | 5 |
2 files changed, 1 insertions, 6 deletions
diff --git a/src/buildstream/_context.py b/src/buildstream/_context.py index 211ee1cae..c6cde4003 100644 --- a/src/buildstream/_context.py +++ b/src/buildstream/_context.py @@ -487,7 +487,7 @@ class Context(): def get_cascache(self): if self._cascache is None: - self._cascache = CASCache(self.cachedir) + self._cascache = CASCache(self.cachedir, cache_quota=self.config_cache_quota) return self._cascache # disable_fork(): diff --git a/tests/artifactcache/expiry.py b/tests/artifactcache/expiry.py index 83e4b19bd..0913b569f 100644 --- a/tests/artifactcache/expiry.py +++ b/tests/artifactcache/expiry.py @@ -41,7 +41,6 @@ DATA_DIR = os.path.join( # Ensure that the cache successfully removes an old artifact if we do # not have enough space left. @pytest.mark.datafiles(DATA_DIR) -@pytest.mark.xfail() def test_artifact_expires(cli, datafiles): project = str(datafiles) element_path = 'elements' @@ -84,7 +83,6 @@ def test_artifact_expires(cli, datafiles): (399999) ]) @pytest.mark.datafiles(DATA_DIR) -@pytest.mark.xfail() def test_artifact_too_large(cli, datafiles, size): project = str(datafiles) element_path = 'elements' @@ -103,7 +101,6 @@ def test_artifact_too_large(cli, datafiles, size): @pytest.mark.datafiles(DATA_DIR) -@pytest.mark.xfail() def test_expiry_order(cli, datafiles): project = str(datafiles) element_path = 'elements' @@ -161,7 +158,6 @@ def test_expiry_order(cli, datafiles): # in the current build pipeline, because that would be embarassing, # wouldn't it? @pytest.mark.datafiles(DATA_DIR) -@pytest.mark.xfail() def test_keep_dependencies(cli, datafiles): project = str(datafiles) element_path = 'elements' @@ -261,7 +257,6 @@ def test_never_delete_required(cli, datafiles): # artifacts we do not require, and the new build is run with dynamic tracking. # @pytest.mark.datafiles(DATA_DIR) -@pytest.mark.xfail() def test_never_delete_required_track(cli, datafiles): project = str(datafiles) element_path = 'elements' |