Skip to content
Snippets Groups Projects
Commit baa9866c authored by Tyler Baker's avatar Tyler Baker
Browse files

Merge branch 'master' into release

parents 4e56731e dc712983
No related branches found
No related tags found
No related merge requests found
......@@ -86,7 +86,6 @@ class MasterImageTarget(Target):
def power_on(self):
self._boot_linaro_image()
self._auto_login(self.proc)
return self.proc
def power_off(self, proc):
......@@ -501,6 +500,7 @@ class MasterImageTarget(Target):
self._hard_reboot()
self._enter_bootloader(self.proc)
self._customize_bootloader(self.proc, boot_cmds)
self._auto_login(self.proc)
target_class = MasterImageTarget
......
......@@ -365,6 +365,7 @@ class LavaTestJob(object):
self.context.test_data.job_status = 'fail'
raise
finally:
self.context.finish()
device_version = self.context.get_device_version() or 'error'
self.context.test_data.add_metadata({
'target.device_version': device_version
......@@ -385,7 +386,6 @@ class LavaTestJob(object):
except Exception as err:
logging.error("Failed to submit the test result. Error = %s", err)
raise
self.context.finish()
def _aggregate_bundle(self, transport, lava_commands, submit_results):
if "sub_id" not in self.job_data:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment