From 264fa5201c60a045ae1c7472fb8840880d996042 Mon Sep 17 00:00:00 2001 From: James Ennis Date: Mon, 17 Jun 2019 14:09:14 +0100 Subject: tests/artifactcache/junctions.py: Rename 'foo' to 'parent' for clarity --- tests/artifactcache/junctions.py | 6 +++--- tests/artifactcache/junctions/foo/.bst/workspaces.yml | 0 tests/artifactcache/junctions/foo/app.bst | 7 ------- tests/artifactcache/junctions/foo/base.bst | 4 ---- tests/artifactcache/junctions/foo/base/base-element.bst | 4 ---- tests/artifactcache/junctions/foo/base/base.txt | 1 - tests/artifactcache/junctions/foo/base/project.conf | 1 - tests/artifactcache/junctions/foo/foo.txt | 1 - tests/artifactcache/junctions/foo/project.conf | 1 - tests/artifactcache/junctions/foo/target.bst | 5 ----- tests/artifactcache/junctions/parent/.bst/workspaces.yml | 0 tests/artifactcache/junctions/parent/app.bst | 7 +++++++ tests/artifactcache/junctions/parent/base.bst | 4 ++++ tests/artifactcache/junctions/parent/base/base-element.bst | 4 ++++ tests/artifactcache/junctions/parent/base/base.txt | 1 + tests/artifactcache/junctions/parent/base/project.conf | 1 + tests/artifactcache/junctions/parent/foo.txt | 1 + tests/artifactcache/junctions/parent/project.conf | 1 + tests/artifactcache/junctions/parent/target.bst | 5 +++++ 19 files changed, 27 insertions(+), 27 deletions(-) delete mode 100644 tests/artifactcache/junctions/foo/.bst/workspaces.yml delete mode 100644 tests/artifactcache/junctions/foo/app.bst delete mode 100644 tests/artifactcache/junctions/foo/base.bst delete mode 100644 tests/artifactcache/junctions/foo/base/base-element.bst delete mode 100644 tests/artifactcache/junctions/foo/base/base.txt delete mode 100644 tests/artifactcache/junctions/foo/base/project.conf delete mode 100644 tests/artifactcache/junctions/foo/foo.txt delete mode 100644 tests/artifactcache/junctions/foo/project.conf delete mode 100644 tests/artifactcache/junctions/foo/target.bst create mode 100644 tests/artifactcache/junctions/parent/.bst/workspaces.yml create mode 100644 tests/artifactcache/junctions/parent/app.bst create mode 100644 tests/artifactcache/junctions/parent/base.bst create mode 100644 tests/artifactcache/junctions/parent/base/base-element.bst create mode 100644 tests/artifactcache/junctions/parent/base/base.txt create mode 100644 tests/artifactcache/junctions/parent/base/project.conf create mode 100644 tests/artifactcache/junctions/parent/foo.txt create mode 100644 tests/artifactcache/junctions/parent/project.conf create mode 100644 tests/artifactcache/junctions/parent/target.bst 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/.bst/workspaces.yml b/tests/artifactcache/junctions/foo/.bst/workspaces.yml deleted file mode 100644 index e69de29bb..000000000 diff --git a/tests/artifactcache/junctions/foo/app.bst b/tests/artifactcache/junctions/foo/app.bst deleted file mode 100644 index ad43ddb9b..000000000 --- a/tests/artifactcache/junctions/foo/app.bst +++ /dev/null @@ -1,7 +0,0 @@ -kind: import -sources: -- kind: local - path: foo.txt -depends: -- junction: base.bst - filename: base-element.bst diff --git a/tests/artifactcache/junctions/foo/base.bst b/tests/artifactcache/junctions/foo/base.bst deleted file mode 100644 index 10ce559a9..000000000 --- a/tests/artifactcache/junctions/foo/base.bst +++ /dev/null @@ -1,4 +0,0 @@ -kind: junction -sources: -- kind: local - path: base diff --git a/tests/artifactcache/junctions/foo/base/base-element.bst b/tests/artifactcache/junctions/foo/base/base-element.bst deleted file mode 100644 index 2b61c518b..000000000 --- a/tests/artifactcache/junctions/foo/base/base-element.bst +++ /dev/null @@ -1,4 +0,0 @@ -kind: import -sources: -- kind: local - path: base.txt diff --git a/tests/artifactcache/junctions/foo/base/base.txt b/tests/artifactcache/junctions/foo/base/base.txt deleted file mode 100644 index a496efee8..000000000 --- a/tests/artifactcache/junctions/foo/base/base.txt +++ /dev/null @@ -1 +0,0 @@ -This is a text file diff --git a/tests/artifactcache/junctions/foo/base/project.conf b/tests/artifactcache/junctions/foo/base/project.conf deleted file mode 100644 index 951ea1a34..000000000 --- a/tests/artifactcache/junctions/foo/base/project.conf +++ /dev/null @@ -1 +0,0 @@ -name: base diff --git a/tests/artifactcache/junctions/foo/foo.txt b/tests/artifactcache/junctions/foo/foo.txt deleted file mode 100644 index 257cc5642..000000000 --- a/tests/artifactcache/junctions/foo/foo.txt +++ /dev/null @@ -1 +0,0 @@ -foo 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/target.bst b/tests/artifactcache/junctions/foo/target.bst deleted file mode 100644 index 092fd9668..000000000 --- a/tests/artifactcache/junctions/foo/target.bst +++ /dev/null @@ -1,5 +0,0 @@ -kind: stack -depends: -- junction: base.bst - filename: base-element.bst -- app.bst diff --git a/tests/artifactcache/junctions/parent/.bst/workspaces.yml b/tests/artifactcache/junctions/parent/.bst/workspaces.yml new file mode 100644 index 000000000..e69de29bb diff --git a/tests/artifactcache/junctions/parent/app.bst b/tests/artifactcache/junctions/parent/app.bst new file mode 100644 index 000000000..ad43ddb9b --- /dev/null +++ b/tests/artifactcache/junctions/parent/app.bst @@ -0,0 +1,7 @@ +kind: import +sources: +- kind: local + path: foo.txt +depends: +- junction: base.bst + filename: base-element.bst diff --git a/tests/artifactcache/junctions/parent/base.bst b/tests/artifactcache/junctions/parent/base.bst new file mode 100644 index 000000000..10ce559a9 --- /dev/null +++ b/tests/artifactcache/junctions/parent/base.bst @@ -0,0 +1,4 @@ +kind: junction +sources: +- kind: local + path: base diff --git a/tests/artifactcache/junctions/parent/base/base-element.bst b/tests/artifactcache/junctions/parent/base/base-element.bst new file mode 100644 index 000000000..2b61c518b --- /dev/null +++ b/tests/artifactcache/junctions/parent/base/base-element.bst @@ -0,0 +1,4 @@ +kind: import +sources: +- kind: local + path: base.txt diff --git a/tests/artifactcache/junctions/parent/base/base.txt b/tests/artifactcache/junctions/parent/base/base.txt new file mode 100644 index 000000000..a496efee8 --- /dev/null +++ b/tests/artifactcache/junctions/parent/base/base.txt @@ -0,0 +1 @@ +This is a text file diff --git a/tests/artifactcache/junctions/parent/base/project.conf b/tests/artifactcache/junctions/parent/base/project.conf new file mode 100644 index 000000000..951ea1a34 --- /dev/null +++ b/tests/artifactcache/junctions/parent/base/project.conf @@ -0,0 +1 @@ +name: base diff --git a/tests/artifactcache/junctions/parent/foo.txt b/tests/artifactcache/junctions/parent/foo.txt new file mode 100644 index 000000000..257cc5642 --- /dev/null +++ b/tests/artifactcache/junctions/parent/foo.txt @@ -0,0 +1 @@ +foo 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/parent/target.bst b/tests/artifactcache/junctions/parent/target.bst new file mode 100644 index 000000000..092fd9668 --- /dev/null +++ b/tests/artifactcache/junctions/parent/target.bst @@ -0,0 +1,5 @@ +kind: stack +depends: +- junction: base.bst + filename: base-element.bst +- app.bst -- cgit v1.2.1