11 files changed, 4 insertions, 4 deletions
diff --git a/tests/artifactcache/junctions.py b/tests/artifactcache/junctions.py
index 9883b49b7..f677a2bd6 100644
--- a/tests/artifactcache/junctions.py
+++ b/tests/artifactcache/junctions.py
@@ -40,10 +40,10 @@ def project_set_artifacts(project, url):
 
 @pytest.mark.datafiles(DATA_DIR)
 def test_push_pull(cli, tmpdir, datafiles):
-    project = os.path.join(str(datafiles), 'foo')
+    project = os.path.join(str(datafiles), 'parent')
     base_project = os.path.join(str(project), 'base')
 
-    with create_artifact_share(os.path.join(str(tmpdir), 'artifactshare-foo')) as share,\
+    with create_artifact_share(os.path.join(str(tmpdir), 'artifactshare-parent')) as share,\
         create_artifact_share(os.path.join(str(tmpdir), 'artifactshare-base')) as base_share:
 
         # First build it without the artifact cache configured
@@ -64,7 +64,7 @@ def test_push_pull(cli, tmpdir, datafiles):
         assert result.exit_code == 0
 
         # And finally assert that the artifacts are in the right shares
-        assert_shared(cli, share, 'foo', project, 'target.bst')
+        assert_shared(cli, share, 'parent', 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
diff --git a/tests/artifactcache/junctions/foo/project.conf b/tests/artifactcache/junctions/foo/project.conf
deleted file mode 100644
index 5a240e3ed..000000000
--- a/tests/artifactcache/junctions/foo/project.conf
+++ /dev/null
@@ -1 +0,0 @@
-name: foo
diff --git a/tests/artifactcache/junctions/foo/.bst/workspaces.yml b/tests/artifactcache/junctions/parent/.bst/workspaces.yml
index e69de29bb..e69de29bb 100644
--- a/tests/artifactcache/junctions/foo/.bst/workspaces.yml
+++ b/tests/artifactcache/junctions/parent/.bst/workspaces.yml
diff --git a/tests/artifactcache/junctions/foo/app.bst b/tests/artifactcache/junctions/parent/app.bst
index ad43ddb9b..ad43ddb9b 100644
--- a/tests/artifactcache/junctions/foo/app.bst
+++ b/tests/artifactcache/junctions/parent/app.bst
diff --git a/tests/artifactcache/junctions/foo/base.bst b/tests/artifactcache/junctions/parent/base.bst
index 10ce559a9..10ce559a9 100644
--- a/tests/artifactcache/junctions/foo/base.bst
+++ b/tests/artifactcache/junctions/parent/base.bst
diff --git a/tests/artifactcache/junctions/foo/base/base-element.bst b/tests/artifactcache/junctions/parent/base/base-element.bst
index 2b61c518b..2b61c518b 100644
--- a/tests/artifactcache/junctions/foo/base/base-element.bst
+++ b/tests/artifactcache/junctions/parent/base/base-element.bst
diff --git a/tests/artifactcache/junctions/foo/base/base.txt b/tests/artifactcache/junctions/parent/base/base.txt
index a496efee8..a496efee8 100644
--- a/tests/artifactcache/junctions/foo/base/base.txt
+++ b/tests/artifactcache/junctions/parent/base/base.txt
diff --git a/tests/artifactcache/junctions/foo/base/project.conf b/tests/artifactcache/junctions/parent/base/project.conf
index 951ea1a34..951ea1a34 100644
--- a/tests/artifactcache/junctions/foo/base/project.conf
+++ b/tests/artifactcache/junctions/parent/base/project.conf
diff --git a/tests/artifactcache/junctions/foo/foo.txt b/tests/artifactcache/junctions/parent/foo.txt
index 257cc5642..257cc5642 100644
--- a/tests/artifactcache/junctions/foo/foo.txt
+++ b/tests/artifactcache/junctions/parent/foo.txt
diff --git a/tests/artifactcache/junctions/parent/project.conf b/tests/artifactcache/junctions/parent/project.conf
new file mode 100644
index 000000000..620fb42dc
--- /dev/null
+++ b/tests/artifactcache/junctions/parent/project.conf
@@ -0,0 +1 @@
+name: parent
diff --git a/tests/artifactcache/junctions/foo/target.bst b/tests/artifactcache/junctions/parent/target.bst
index 092fd9668..092fd9668 100644
--- a/tests/artifactcache/junctions/foo/target.bst
+++ b/tests/artifactcache/junctions/parent/target.bst