diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/artifactcache/push.py | 7 | ||||
| -rw-r--r-- | tests/sourcecache/fetch.py | 6 | ||||
| -rw-r--r-- | tests/sourcecache/push.py | 2 | ||||
| -rw-r--r-- | tests/sourcecache/staging.py | 3 |
4 files changed, 0 insertions, 18 deletions
diff --git a/tests/artifactcache/push.py b/tests/artifactcache/push.py index 0bcf20502..0be2e4933 100644 --- a/tests/artifactcache/push.py +++ b/tests/artifactcache/push.py @@ -6,7 +6,6 @@ import os import pytest from buildstream import _yaml -from buildstream.types import _Scope from buildstream._project import Project from buildstream._protos.build.bazel.remote.execution.v2 import remote_execution_pb2 from buildstream.testing import cli # pylint: disable=unused-import @@ -33,12 +32,6 @@ def _push(cli, cache_dir, project_dir, config_file, target): # Create a local artifact cache handle artifactcache = context.artifactcache - # Ensure the element's artifact memeber is initialised - # This is duplicated from Pipeline.resolve_elements() - # as this test does not use the cli frontend. - for e in element._dependencies(_Scope.ALL): - e._initialize_state() - # Manually setup the CAS remotes artifactcache.setup_remotes(use_config=True) artifactcache.initialize_remotes() diff --git a/tests/sourcecache/fetch.py b/tests/sourcecache/fetch.py index 1f8911f84..d5aac0fe4 100644 --- a/tests/sourcecache/fetch.py +++ b/tests/sourcecache/fetch.py @@ -74,7 +74,6 @@ def test_source_fetch(cli, tmpdir, datafiles): project.ensure_fully_loaded() element = project.load_elements([element_name])[0] - element._initialize_state() element._fetch(check_only=True) assert not element._cached_sources() source = list(element.sources())[0] @@ -115,7 +114,6 @@ def test_source_fetch(cli, tmpdir, datafiles): project.ensure_fully_loaded() element = project.load_elements([element_name])[0] - element._initialize_state() # check that we have the source in the cas now and it's not fetched element._fetch(check_only=True) @@ -136,7 +134,6 @@ def test_fetch_fallback(cli, tmpdir, datafiles): project.ensure_fully_loaded() element = project.load_elements([element_name])[0] - element._initialize_state() element._fetch(check_only=True) assert not element._cached_sources() source = list(element.sources())[0] @@ -155,7 +152,6 @@ def test_fetch_fallback(cli, tmpdir, datafiles): # Check that the source in both in the source dir and the local CAS element = project.load_elements([element_name])[0] - element._initialize_state() element._fetch(check_only=True) assert element._cached_sources() @@ -172,7 +168,6 @@ def test_pull_fail(cli, tmpdir, datafiles): project.ensure_fully_loaded() element = project.load_elements([element_name])[0] - element._initialize_state() element._fetch(check_only=True) assert not element._cached_sources() source = list(element.sources())[0] @@ -205,7 +200,6 @@ def test_source_pull_partial_fallback_fetch(cli, tmpdir, datafiles): project.ensure_fully_loaded() element = project.load_elements([element_name])[0] - element._initialize_state() element._fetch(check_only=True) assert not element._cached_sources() source = list(element.sources())[0] diff --git a/tests/sourcecache/push.py b/tests/sourcecache/push.py index 9288446e5..3291c4023 100644 --- a/tests/sourcecache/push.py +++ b/tests/sourcecache/push.py @@ -84,7 +84,6 @@ def test_source_push_split(cli, tmpdir, datafiles): project.ensure_fully_loaded() element = project.load_elements(["push.bst"])[0] - element._initialize_state() element._fetch(check_only=True) assert not element._cached_sources() source = list(element.sources())[0] @@ -135,7 +134,6 @@ def test_source_push(cli, tmpdir, datafiles): project.ensure_fully_loaded() element = project.load_elements(["push.bst"])[0] - element._initialize_state() element._fetch(check_only=True) assert not element._cached_sources() source = list(element.sources())[0] diff --git a/tests/sourcecache/staging.py b/tests/sourcecache/staging.py index 6d00c3eed..dc4ba2cfb 100644 --- a/tests/sourcecache/staging.py +++ b/tests/sourcecache/staging.py @@ -64,7 +64,6 @@ def test_source_staged(tmpdir, cli, datafiles): # now check that the source is in the refs file, this is pretty messy but # seems to be the only way to get the sources? element = project.load_elements(["import-bin.bst"])[0] - element._initialize_state() element._fetch(check_only=True) source = list(element.sources())[0] assert element._cached_sources() @@ -100,7 +99,6 @@ def test_source_fetch(tmpdir, cli, datafiles): sourcecache = context.sourcecache element = project.load_elements(["import-dev.bst"])[0] - element._initialize_state() element._fetch(check_only=True) source = list(element.sources())[0] assert element._cached_sources() @@ -135,7 +133,6 @@ def test_staged_source_build(tmpdir, datafiles, cli): project.ensure_fully_loaded() element = project.load_elements(["import-dev.bst"])[0] - element._initialize_state() # check consistency of the source element._fetch(check_only=True) |