diff --git a/swh/scanner/model.py b/swh/scanner/model.py --- a/swh/scanner/model.py +++ b/swh/scanner/model.py @@ -146,7 +146,11 @@ """ - return {k: v for node in self.iterate() for k, v in node.attributes.items()} + return { + k.replace(f"{self.path}/", "", 1): v + for node in self.iterate() + for k, v in node.attributes.items() + } def iterate(self) -> Iterator[Tree]: """ diff --git a/swh/scanner/tests/test_model.py b/swh/scanner/tests/test_model.py --- a/swh/scanner/tests/test_model.py +++ b/swh/scanner/tests/test_model.py @@ -46,7 +46,6 @@ def test_get_json_tree_only_one_present(example_tree, temp_folder): - root = temp_folder["root"] filesample_path = temp_folder["filesample"] for path, swhid in temp_folder["paths"].items(): @@ -57,7 +56,7 @@ assert len(result) == 6 for path, node_attr in result.items(): - if path == str(root) + "/subdir/filesample.txt": + if path == "subdir/filesample.txt": assert node_attr["known"] is True else: assert node_attr["known"] is False