Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions lib/pavilion/commands/result.py
Original file line number Diff line number Diff line change
Expand Up @@ -218,11 +218,17 @@ def run(self, pav_cfg, args):
else:
fields = self.key_fields(args)
flat_results = []
key_results = set()
all_passed = True
for rslt in results:
flat_results.append(utils.flatten_dictionary(rslt))
if rslt['result'] != TestRun.PASS:
all_passed = False

key_results = key_results.union(set(rslt.get('key_results', [])))

fields += key_results

field_info = {
'created': {'transform': output.get_relative_timestamp},
'started': {'transform': output.get_relative_timestamp},
Expand Down
6 changes: 6 additions & 0 deletions lib/pavilion/test_config/file_format.py
Original file line number Diff line number Diff line change
Expand Up @@ -858,6 +858,12 @@ class TestConfigLoader(yc.YamlConfigLoader):
"strings). Other result values (including those "
"from result parsers and other evaluations are "
"available to reference as variables."),
yc.ListElem(
'key_results',
sub_elem=yc.StrElem(),
help_text="The list of result keys that should be considered "
"'key results'. These results appear automatically "
"when running 'pav results'."),
ModuleWrapperCatElem(
'module_wrappers',
help_text="Whenever the given module[/version] is asked for in the 'build.modules' "
Expand Down
1 change: 1 addition & 0 deletions lib/pavilion/test_run/test_run.py
Original file line number Diff line number Diff line change
Expand Up @@ -945,6 +945,7 @@ def gather_results(self, run_result: int, regather: bool = False,
results = result.base_results(self)

results['return_value'] = run_result
results['key_results'] = self.config.get('key_results', [])

result_log("Base results:")
result_log.indent(pprint.pformat(results))
Expand Down
35 changes: 35 additions & 0 deletions test/tests/result_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -1123,3 +1123,38 @@ def test_flatten_results(self):

self.assertEqual(flattened, answer)
self.assertEqual(unflattened, answer)

def test_key_results(self):
"""Check that specifying key results causes those values to show up
in the results table."""

cfg = self._quick_test_cfg()

cfg['run']['cmds'] = [
'echo hello'
]
cfg['result_parse']['regex'] = {
'hello': {
'regex': 'hello',
}
}
cfg['key_results'] = ['hello']

test = self._quick_test(cfg, name="key_results_test")
run_result = test.run()
results = test.gather_results(run_result)
test.save_results(results)

result_cmd = commands.get_command('result')
result_cmd.silence()

arg_parser = arguments.get_parser()
res_args = arg_parser.parse_args(("result", test.full_id))

result_cmd.run(self.pav_cfg, res_args)
cmd_out, cmd_err = result_cmd.clear_output()

lines = cmd_out.split('\n')

self.assertIn("Hello", lines[2])
self.assertIn("hello", lines[4])