From d031349a5f82882bff1067b11bdc40d13bb6fe46 Mon Sep 17 00:00:00 2001 From: Tristan Van Berkom Date: Mon, 6 May 2019 19:15:52 +0900 Subject: 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. --- buildstream/testing/runcli.py | 4 ++-- 1 file 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(): -- cgit v1.2.1