zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add hash field to spec on find --json and assert in test its there (#26443)

Browse Source 
Co-authored-by: Daniel Travieso <daniel@dgtravieso.com>
This commit is contained in:
Daniel G Travieso 2021-10-08 03:50:05 -03:00 committed by GitHub
parent 449a5832c8
commit 10de12c7d0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/spack/spack/cmd/__init__.py
View File

@ -259,17 +259,19 @@ def display_specs_as_json(specs, deps=False):
seen = set() seen = set()
records = [] records = []
for spec in specs: for spec in specs:
if spec.dag_hash() in seen: dag_hash = spec.dag_hash()
if dag_hash in seen:
continue continue
seen.add(spec.dag_hash()) records.append(spec.node_dict_with_hashes())
records.append(spec.to_node_dict()) seen.add(dag_hash)
if deps: if deps:
for dep in spec.traverse(): for dep in spec.traverse():
if dep.dag_hash() in seen: dep_dag_hash = dep.dag_hash()
if dep_dag_hash in seen:
continue continue
seen.add(dep.dag_hash()) records.append(dep.node_dict_with_hashes())
records.append(dep.to_node_dict()) seen.add(dep_dag_hash)
sjson.dump(records, sys.stdout) sjson.dump(records, sys.stdout)

1
lib/spack/spack/test/cmd/find.py
View File

@ -128,6 +128,7 @@ def test_namespaces_shown_correctly(database):
def _check_json_output(spec_list): def _check_json_output(spec_list):
assert len(spec_list) == 3 assert len(spec_list) == 3
assert all(spec["name"] == "mpileaks" for spec in spec_list) assert all(spec["name"] == "mpileaks" for spec in spec_list)
assert all(spec["hash"] for spec in spec_list)
deps = [spec["dependencies"] for spec in spec_list] deps = [spec["dependencies"] for spec in spec_list]
assert sum(["zmpi" in [node["name"] for d in deps for node in d]]) == 1 assert sum(["zmpi" in [node["name"] for d in deps for node in d]]) == 1