From 0ee9fd6275da7f913d0890ae4202c46a9d20e55e Mon Sep 17 00:00:00 2001
From: James Ennis <james.ennis@codethink.co.uk>
Date: Mon, 17 Jun 2019 12:11:48 +0100
Subject: tests/artifactcache/junctions.py: Rename misleading 'target' element

---
 tests/artifactcache/junctions.py                        | 8 ++++----
 tests/artifactcache/junctions/foo/app.bst               | 2 +-
 tests/artifactcache/junctions/foo/base/base-element.bst | 4 ++++
 tests/artifactcache/junctions/foo/base/target.bst       | 4 ----
 tests/artifactcache/junctions/foo/target.bst            | 2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)
 create mode 100644 tests/artifactcache/junctions/foo/base/base-element.bst
 delete mode 100644 tests/artifactcache/junctions/foo/base/target.bst

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/base-element.bst b/tests/artifactcache/junctions/foo/base/base-element.bst
new file mode 100644
index 000000000..2b61c518b
--- /dev/null
+++ b/tests/artifactcache/junctions/foo/base/base-element.bst
@@ -0,0 +1,4 @@
+kind: import
+sources:
+- kind: local
+  path: base.txt
diff --git a/tests/artifactcache/junctions/foo/base/target.bst b/tests/artifactcache/junctions/foo/base/target.bst
deleted file mode 100644
index 2b61c518b..000000000
--- a/tests/artifactcache/junctions/foo/base/target.bst
+++ /dev/null
@@ -1,4 +0,0 @@
-kind: import
-sources:
-- kind: local
-  path: base.txt
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
-- 
cgit v1.2.1