summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTristan Van Berkom <tristan.vanberkom@codethink.co.uk>2019-05-06 19:15:52 +0900
committerTom Pollard <tom.pollard@codethink.co.uk>2019-05-07 12:24:17 +0100
commit504d6da6650c92ab88e0dc814ed9dbf83df49c89 (patch)
tree2df2d8f29119fde2196d06c437d721079966bf48
parent9a9ee4102f89e5a360aaf58e14170e24cb9f51ef (diff)
downloadbuildstream-504d6da6650c92ab88e0dc814ed9dbf83df49c89.tar.gz
testing/runcli.py: Fix remove_artifact_from_cache() to work with subdirs.
The artifact directories are based on the element normal_name, which substitutes any path separators with dashes. Fix the helper function to use the correct path.
-rw-r--r--buildstream/testing/runcli.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/buildstream/testing/runcli.py b/buildstream/testing/runcli.py
index 72bdce09e..934c31236 100644
--- a/buildstream/testing/runcli.py
+++ b/buildstream/testing/runcli.py
@@ -637,8 +637,8 @@ class TestArtifact():
def remove_artifact_from_cache(self, cache_dir, element_name):
cache_dir = os.path.join(cache_dir, 'cas', 'refs', 'heads')
-
- cache_dir = os.path.splitext(os.path.join(cache_dir, 'test', element_name))[0]
+ normal_name = element_name.replace(os.sep, '-')
+ cache_dir = os.path.splitext(os.path.join(cache_dir, 'test', normal_name))[0]
shutil.rmtree(cache_dir)
# is_cached():