Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

twister: stats: fix platform stats #81357

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions scripts/pylib/twister/twisterlib/reports.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,13 @@ def __init__(self, plan, env) -> None:
self.instances = plan.instances
self.platforms = plan.platforms
self.selected_platforms = plan.selected_platforms
self.filtered_platforms = plan.filtered_platforms
self.env = env
self.timestamp = datetime.now().isoformat()
self.outdir = os.path.abspath(env.options.outdir)
self.instance_fail_count = plan.instance_fail_count
self.footprint = None


@staticmethod
def process_log(log_file):
filtered_string = ""
Expand Down Expand Up @@ -601,19 +601,21 @@ def summary(self, results, ignore_unrecognized_sections, duration):
)

total_platforms = len(self.platforms)
filtered_platforms = set(instance.platform.name for instance in self.instances.values()
if instance.status not in[TwisterStatus.FILTER, TwisterStatus.NOTRUN, TwisterStatus.SKIP])
# if we are only building, do not report about tests being executed.
if self.platforms and not self.env.options.build_only:
executed_cases = results.cases - results.filtered_cases - results.skipped_cases - results.notrun_cases
pass_rate = 100 * (float(results.passed_cases) / float(executed_cases)) \
if executed_cases != 0 else 0
platform_rate = (100 * len(self.filtered_platforms) / len(self.platforms))
platform_rate = (100 * len(filtered_platforms) / len(self.platforms))
logger.info(
f'{results.passed_cases} of {executed_cases} executed test cases passed ({pass_rate:02.2f}%)'
f'{", " + str(results.blocked_cases) + " blocked" if results.blocked_cases else ""}'
f'{", " + str(results.failed_cases) + " failed" if results.failed_cases else ""}'
f'{", " + str(results.error_cases) + " errored" if results.error_cases else ""}'
f'{", " + str(results.none_cases) + " without a status" if results.none_cases else ""}'
f' on {len(self.filtered_platforms)} out of total {total_platforms} platforms ({platform_rate:02.2f}%).'
f' on {len(filtered_platforms)} out of total {total_platforms} platforms ({platform_rate:02.2f}%).'
)
if results.skipped_cases or results.notrun_cases:
logger.info(
Expand Down
4 changes: 0 additions & 4 deletions scripts/pylib/twister/twisterlib/testplan.py
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,6 @@ def __init__(self, env=None):
self.platforms = []
self.platform_names = []
self.selected_platforms = []
self.filtered_platforms = []
self.default_platforms = []
self.load_errors = 0
self.instances = dict()
Expand Down Expand Up @@ -1079,9 +1078,6 @@ def apply_filters(self, **kwargs):

filtered_instance.add_missing_case_status(filtered_instance.status)

self.filtered_platforms = set(p.platform.name for p in self.instances.values()
if p.status != TwisterStatus.SKIP )

def add_instances(self, instance_list):
for instance in instance_list:
self.instances[instance.name] = instance
Expand Down
4 changes: 2 additions & 2 deletions scripts/tests/twister_blackbox/test_platform.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ class TestPlatform:
'errored_configurations': 0,
'executed_test_cases': 8,
'skipped_test_cases': 2,
'platform_count': 3,
'platform_count': 2,
'executed_on_platform': 4,
'only_built': 2
}
Expand All @@ -59,7 +59,7 @@ class TestPlatform:
'errored_configurations': 0,
'executed_test_cases': 0,
'skipped_test_cases': 0,
'platform_count': 3,
'platform_count': 0,
'executed_on_platform': 0,
'only_built': 0
}
Expand Down
2 changes: 1 addition & 1 deletion scripts/tests/twister_blackbox/test_runner.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ class TestRunner:
'errored_configurations': 0,
'executed_test_cases': 8,
'skipped_test_cases': 0,
'platform_count': 0,
'platform_count': 2,
'executed_on_platform': 4,
'only_built': 0
}
Expand Down
Loading