summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMilosz Wasilewski <milosz.wasilewski@linaro.org>2016-11-25 14:13:25 +0000
committerMilosz Wasilewski <milosz.wasilewski@linaro.org>2016-11-29 14:56:57 +0000
commita76e8dd06dc4df3c397928f8b3e55c3be8e85d93 (patch)
treee14518eb1e36adb9490638d422c86cbe52877a2e
parentae53fcce0f7b2504fdb11601bf805fb893405d40 (diff)
test-runner: record default parameters
Default parameters from test definition are now recorded in the result Change-Id: Id8d0fc88c694d158f6406586f5c79dcc3a83c164 Signed-off-by: Milosz Wasilewski <milosz.wasilewski@linaro.org>
-rwxr-xr-xautomated/utils/test-runner.py10
1 files changed, 7 insertions, 3 deletions
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: