diff options
| author | James Ennis <james.ennis@codethink.co.uk> | 2019-06-17 12:11:48 +0100 |
|---|---|---|
| committer | James Ennis <james.ennis@codethink.com> | 2019-06-26 08:36:20 +0000 |
| commit | 0ee9fd6275da7f913d0890ae4202c46a9d20e55e (patch) | |
| tree | e2e29cedc867cd3824a7e6b16593dca6ee4e8f40 | |
| parent | 57a2baaa3a260f6a6dd50552ec8c0d71e1b8ccf1 (diff) | |
| download | buildstream-0ee9fd6275da7f913d0890ae4202c46a9d20e55e.tar.gz | |
tests/artifactcache/junctions.py: Rename misleading 'target' element
| -rw-r--r-- | tests/artifactcache/junctions.py | 8 | ||||
| -rw-r--r-- | tests/artifactcache/junctions/foo/app.bst | 2 | ||||
| -rw-r--r-- | tests/artifactcache/junctions/foo/base/base-element.bst (renamed from tests/artifactcache/junctions/foo/base/target.bst) | 0 | ||||
| -rw-r--r-- | tests/artifactcache/junctions/foo/target.bst | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/tests/artifactcache/junctions.py b/tests/artifactcache/junctions.py index ab041ce27..9883b49b7 100644 --- a/tests/artifactcache/junctions.py +++ b/tests/artifactcache/junctions.py @@ -53,7 +53,7 @@ def test_push_pull(cli, tmpdir, datafiles): # Assert that we are now cached locally state = cli.get_element_state(project, 'target.bst') assert state == 'cached' - state = cli.get_element_state(base_project, 'target.bst') + state = cli.get_element_state(base_project, 'base-element.bst') assert state == 'cached' project_set_artifacts(project, share.repo) @@ -65,7 +65,7 @@ def test_push_pull(cli, tmpdir, datafiles): # And finally assert that the artifacts are in the right shares assert_shared(cli, share, 'foo', project, 'target.bst') - assert_shared(cli, base_share, 'base', base_project, 'target.bst') + assert_shared(cli, base_share, 'base', base_project, 'base-element.bst') # Now we've pushed, delete the user's local artifact cache # directory and try to redownload it from the share @@ -78,7 +78,7 @@ def test_push_pull(cli, tmpdir, datafiles): # Assert that nothing is cached locally anymore state = cli.get_element_state(project, 'target.bst') assert state != 'cached' - state = cli.get_element_state(base_project, 'target.bst') + state = cli.get_element_state(base_project, 'base-element.bst') assert state != 'cached' # Now try bst artifact pull @@ -88,5 +88,5 @@ def test_push_pull(cli, tmpdir, datafiles): # And assert that they are again in the local cache, without having built state = cli.get_element_state(project, 'target.bst') assert state == 'cached' - state = cli.get_element_state(base_project, 'target.bst') + state = cli.get_element_state(base_project, 'base-element.bst') assert state == 'cached' diff --git a/tests/artifactcache/junctions/foo/app.bst b/tests/artifactcache/junctions/foo/app.bst index e658628b0..ad43ddb9b 100644 --- a/tests/artifactcache/junctions/foo/app.bst +++ b/tests/artifactcache/junctions/foo/app.bst @@ -4,4 +4,4 @@ sources: path: foo.txt depends: - junction: base.bst - filename: target.bst + filename: base-element.bst diff --git a/tests/artifactcache/junctions/foo/base/target.bst b/tests/artifactcache/junctions/foo/base/base-element.bst index 2b61c518b..2b61c518b 100644 --- a/tests/artifactcache/junctions/foo/base/target.bst +++ b/tests/artifactcache/junctions/foo/base/base-element.bst diff --git a/tests/artifactcache/junctions/foo/target.bst b/tests/artifactcache/junctions/foo/target.bst index 70b78a3fc..092fd9668 100644 --- a/tests/artifactcache/junctions/foo/target.bst +++ b/tests/artifactcache/junctions/foo/target.bst @@ -1,5 +1,5 @@ kind: stack depends: - junction: base.bst - filename: target.bst + filename: base-element.bst - app.bst |