aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorchenjiankun <chenjiankun1@huawei.com>2017-07-31 03:33:00 +0000
committerchenjiankun <chenjiankun1@huawei.com>2017-07-31 03:33:00 +0000
commit6ed2d4867210165fefb8aaabf18dc91b1896064d (patch)
tree308ac5db4fc462e0d849229d7e07778887fd4b99
parent5abe4fe013a14c528bfb1e0ff4c8bcb9b8817551 (diff)
Bugfix: yardstick always report 'PASS' to DB
JIRA: YARDSTICK-768 Now yardstick will not stop if test case failed, so that we can run the rest test case in the suite. CI judge task status by the cmd return code. In this way, the 'yardstick task start' cmd will always return 0. So we will always report 'PASS' to DB. In this patch I add a judgement in cmd, if the status is not 'PASS', we will raise a RuntimeError. Change-Id: I655424dd9cd3782869986963a17b24acfb340345 Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
-rw-r--r--yardstick/cmd/commands/task.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/yardstick/cmd/commands/task.py b/yardstick/cmd/commands/task.py
index 03f6b1b1e..8d8ea2b3c 100644
--- a/yardstick/cmd/commands/task.py
+++ b/yardstick/cmd/commands/task.py
@@ -51,11 +51,17 @@ class TaskCommands(object): # pragma: no cover
self.output_file = param.output_file
try:
- Task().start(param, **kwargs)
+ result = Task().start(param, **kwargs)
except Exception as e:
self._write_error_data(e)
LOG.exception("")
+ if result.get('result', {}).get('criteria') == 'PASS':
+ LOG.info('Task Success')
+ else:
+ LOG.info('Task Failed')
+ raise RuntimeError('Task Failed')
+
def _write_error_data(self, error):
data = {'status': 2, 'result': str(error)}
write_json_to_file(self.output_file, data)