From a76e8dd06dc4df3c397928f8b3e55c3be8e85d93 Mon Sep 17 00:00:00 2001 From: Milosz Wasilewski Date: Fri, 25 Nov 2016 14:13:25 +0000 Subject: test-runner: record default parameters Default parameters from test definition are now recorded in the result Change-Id: Id8d0fc88c694d158f6406586f5c79dcc3a83c164 Signed-off-by: Milosz Wasilewski --- automated/utils/test-runner.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'automated/utils') diff --git a/automated/utils/test-runner.py b/automated/utils/test-runner.py index da719c3..f60206a 100755 --- a/automated/utils/test-runner.py +++ b/automated/utils/test-runner.py @@ -401,11 +401,15 @@ class ResultParser(object): self.results['test'] = self.test_name self.results['id'] = self.test_uuid self.logger = logging.getLogger('RUNNER.ResultParser') - self.results['params'] = None + self.results['params'] = {} + with open(os.path.join(self.result_path, "testdef.yaml"), "r") as f: + self.testdef = yaml.safe_load(f) + if 'params' in self.testdef.keys(): + self.results['params'] = self.testdef['params'] if 'parameters' in test.keys(): - self.results['params'] = test['parameters'] + self.results['params'].update(test['parameters']) if 'params' in test.keys(): - self.results['params'] = test['params'] + self.results['params'].update(test['params']) if 'version' in test.keys(): self.results['version'] = test['version'] else: -- cgit v1.2.3