scripts: twister: Bring 3.7 changes into the new status system
Some 3.7 changes still used string statuses. Signed-off-by: Lukasz Mrugala <lukaszx.mrugala@intel.com>
This commit is contained in:
parent
212f48c146
commit
f429b33d63
3 changed files with 9 additions and 7 deletions
|
@ -342,7 +342,7 @@ class BinaryHandler(Handler):
|
|||
proc.wait()
|
||||
self.returncode = proc.returncode
|
||||
if proc.returncode != 0:
|
||||
self.instance.status = "error"
|
||||
self.instance.status = TwisterStatus.ERROR
|
||||
self.instance.reason = "BinaryHandler returned {}".format(proc.returncode)
|
||||
self.try_kill_process_by_pid()
|
||||
|
||||
|
|
|
@ -283,13 +283,15 @@ class Reporting:
|
|||
for instance in self.instances.values():
|
||||
if platform and platform != instance.platform.name:
|
||||
continue
|
||||
if instance.status == "filtered" and not self.env.options.report_filtered:
|
||||
if instance.status == TwisterStatus.FILTER and not self.env.options.report_filtered:
|
||||
continue
|
||||
if (filters and 'allow_status' in filters and instance.status not in filters['allow_status']):
|
||||
if (filters and 'allow_status' in filters and \
|
||||
instance.status not in [TwisterStatus[s] for s in filters['allow_status']]):
|
||||
logger.debug(f"Skip test suite '{instance.testsuite.name}' status '{instance.status}' "
|
||||
f"not allowed for {filename}")
|
||||
continue
|
||||
if (filters and 'deny_status' in filters and instance.status in filters['deny_status']):
|
||||
if (filters and 'deny_status' in filters and \
|
||||
instance.status in [TwisterStatus[s] for s in filters['deny_status']]):
|
||||
logger.debug(f"Skip test suite '{instance.testsuite.name}' status '{instance.status}' "
|
||||
f"denied for {filename}")
|
||||
continue
|
||||
|
@ -399,7 +401,7 @@ class Reporting:
|
|||
suite['recording'] = instance.recording
|
||||
|
||||
if (instance.status
|
||||
and instance.status not in ["error", "filtered"]
|
||||
and instance.status not in [TwisterStatus.ERROR, TwisterStatus.FILTER]
|
||||
and self.env.options.create_rom_ram_report
|
||||
and self.env.options.footprint_report is not None):
|
||||
# Init as empty data preparing for filtering properties.
|
||||
|
|
|
@ -677,7 +677,7 @@ class ProjectBuilder(FilterBuilder):
|
|||
elif op == "gather_metrics":
|
||||
ret = self.gather_metrics(self.instance)
|
||||
if not ret or ret.get('returncode', 1) > 0:
|
||||
self.instance.status = "error"
|
||||
self.instance.status = TwisterStatus.ERROR
|
||||
self.instance.reason = "Build Failure at gather_metrics."
|
||||
pipeline.put({"op": "report", "test": self.instance})
|
||||
elif self.instance.run and self.instance.handler.ready:
|
||||
|
@ -1302,7 +1302,7 @@ class TwisterRunner:
|
|||
|
||||
no_retry_statuses = [TwisterStatus.PASS, TwisterStatus.SKIP, TwisterStatus.FILTER]
|
||||
if not retry_build_errors:
|
||||
no_retry_statuses.append("error")
|
||||
no_retry_statuses.append(TwisterStatus.ERROR)
|
||||
|
||||
if instance.status not in no_retry_statuses:
|
||||
logger.debug(f"adding {instance.name}")
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue