This is an automated email from the ASF dual-hosted git repository. tvb pushed a commit to branch jennis/new_artifact_subcommands in repository https://gitbox.apache.org/repos/asf/buildstream.git
commit b8aea71b04b9a2c369997f606b5de25e7e00a85c Author: James Ennis <[email protected]> AuthorDate: Fri Jan 11 11:14:34 2019 +0000 cascache.py: Ensure path exists before trying to update the mtime If an artifact is pulled from the cache without its buildtree, CASCache.prune() will fail when it tries to update the mtimes of the build tree's object files. A new integration test has been added to tests/integration/artifact.py which reflects this. --- buildstream/_cas/cascache.py | 3 +++ tests/integration/artifact.py | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+) diff --git a/buildstream/_cas/cascache.py b/buildstream/_cas/cascache.py index f3eeb88..8aa2862 100644 --- a/buildstream/_cas/cascache.py +++ b/buildstream/_cas/cascache.py @@ -740,6 +740,9 @@ class CASCache(): if tree.hash in reachable: return + if not os.path.exists(self.objpath(tree)): + return + if update_mtime: os.utime(self.objpath(tree)) diff --git a/tests/integration/artifact.py b/tests/integration/artifact.py index 607919e..59f6387 100644 --- a/tests/integration/artifact.py +++ b/tests/integration/artifact.py @@ -180,3 +180,43 @@ def test_artifact_delete_unbuilt_artifact(cli, tmpdir, datafiles): expected_err = 'WARNING: {}, not found in local cache - no delete required\n'.format(artifact) assert result.stderr == expected_err + + +# Test that an artifact pulled from it's remote cache (without it's buildtree) will not +# throw an Exception when trying to prune the cache. [email protected] [email protected](DATA_DIR) [email protected](IS_LINUX and not HAVE_BWRAP, reason='Only available with bubblewrap on Linux') +def test_artifact_delete_pulled_artifact_without_buildtree(cli, tmpdir, datafiles): + project = os.path.join(datafiles.dirname, datafiles.basename) + element = 'autotools/amhello.bst' + + # Set up remote and local shares + local_cache = os.path.join(str(tmpdir), 'artifacts') + with create_artifact_share(os.path.join(str(tmpdir), 'remote')) as remote: + cli.configure({ + 'artifacts': {'url': remote.repo, 'push': True}, + 'artifactdir': local_cache, + }) + + # Build the element + result = cli.run(project=project, args=['build', element]) + result.assert_success() + + # Make sure it's in the share + cache_key = cli.get_element_key(project, element) + assert remote.has_artifact('test', element, cache_key) + + # Delete and then pull the artifact (without its buildtree) + result = cli.run(project=project, args=['artifact', 'delete', element]) + result.assert_success() + assert cli.get_element_state(project, element) != 'cached' + result = cli.run(project=project, args=['pull', element]) + result.assert_success() + assert cli.get_element_state(project, element) == 'cached' + + # Now delete it again (it should have been pulled without the buildtree, but + # a digest of the buildtree is pointed to in the artifact's metadata + result = cli.run(project=project, args=['artifact', 'delete', element]) + result.assert_success() + assert cli.get_element_state(project, element) != 'cached'
