diff --git a/toolset/utils/metadata.py b/toolset/utils/metadata.py index 42cf3e9634c..8eb316f387b 100644 --- a/toolset/utils/metadata.py +++ b/toolset/utils/metadata.py @@ -234,12 +234,12 @@ def parse_config(self, config, directory): return tests - def list_test_metadata(self): + def to_jsonable(self): ''' - Prints the metadata for all the available tests + Returns an array suitable for jsonification ''' all_tests = self.gather_tests() - all_tests_json = json.dumps(map(lambda test: { + return map(lambda test: { "project_name": test.project_name, "name": test.name, "approach": test.approach, @@ -256,7 +256,13 @@ def list_test_metadata(self): "notes": test.notes, "versus": test.versus, "tags": hasattr(test, "tags") and test.tags or [] - }, all_tests)) + }, all_tests) + + def list_test_metadata(self): + ''' + Prints the metadata for all the available tests + ''' + all_tests_json = json.dumps(self.to_jsonable()) with open( os.path.join(self.benchmarker.results.directory, diff --git a/toolset/utils/results.py b/toolset/utils/results.py index 60f618bf787..7ea004d4e24 100644 --- a/toolset/utils/results.py +++ b/toolset/utils/results.py @@ -336,6 +336,7 @@ def __to_jsonable(self): toRet['succeeded'] = self.succeeded toRet['failed'] = self.failed toRet['verify'] = self.verify + toRet['test_metadata'] = self.benchmarker.metadata.to_jsonable() return toRet