未验证 提交 fe776a55 编写于 作者: C Cleber Rosa

Merge remote-tracking branch 'apahim/fix_remote_runner'

Signed-off-by: NCleber Rosa <crosa@redhat.com>
...@@ -463,7 +463,7 @@ class RemoteTestRunner(TestRunner): ...@@ -463,7 +463,7 @@ class RemoteTestRunner(TestRunner):
for t_dict in json_result['tests']: for t_dict in json_result['tests']:
logdir = os.path.join(self.job.logdir, 'test-results') logdir = os.path.join(self.job.logdir, 'test-results')
relative_path = astring.string_to_safe_path(str(t_dict['test'])) relative_path = astring.string_to_safe_path(str(t_dict['id']))
logdir = os.path.join(logdir, relative_path) logdir = os.path.join(logdir, relative_path)
t_dict['logdir'] = logdir t_dict['logdir'] = logdir
t_dict['logfile'] = os.path.join(logdir, 'debug.log') t_dict['logfile'] = os.path.join(logdir, 'debug.log')
...@@ -525,7 +525,7 @@ class RemoteTestRunner(TestRunner): ...@@ -525,7 +525,7 @@ class RemoteTestRunner(TestRunner):
self.result.tests_total = results['total'] self.result.tests_total = results['total']
local_log_dir = self.job.logdir local_log_dir = self.job.logdir
for tst in results['tests']: for tst in results['tests']:
name = tst['test'].split('-', 1) name = tst['id'].split('-', 1)
name = [name[0]] + name[1].split(';') name = [name[0]] + name[1].split(';')
if len(name) == 3: if len(name) == 3:
name[2] = {"variant_id": name[2]} name[2] = {"variant_id": name[2]}
......
...@@ -14,7 +14,7 @@ import avocado_runner_remote ...@@ -14,7 +14,7 @@ import avocado_runner_remote
JSON_RESULTS = ('Something other than json\n' JSON_RESULTS = ('Something other than json\n'
'{"tests": [{"test": "1-sleeptest;0",' '{"tests": [{"id": "1-sleeptest;0",'
'"reference": "sleeptest", ' '"reference": "sleeptest", '
'"fail_reason": "None", ' '"fail_reason": "None", '
'"status": "PASS", "time": 1.23, "start": 0, "end": 1.23}],' '"status": "PASS", "time": 1.23, "start": 0, "end": 1.23}],'
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册