twister: stats: skipped_configs -> filtered_configs

Rename variables leading to confusion between skipped and filtered
suites.

Signed-off-by: Anas Nashif <[email protected]>

Author: nashif

scripts/pylib/twister/twisterlib/reports.py

@@ -584,14 +584,14 @@ def summary(self, results, ignore_unrecognized_sections, duration):
             if float(handler_time) > 0:
                 run += 1
 
-        if results.total and results.total != results.skipped_configs:
-            pass_rate = (float(results.passed) / float(results.total - results.skipped_configs))
+        if results.total and results.total != results.filtered_configs:
+            pass_rate = (float(results.passed) / float(results.total - results.filtered_configs))
         else:
             pass_rate = 0
 
         logger.info(
             f"{TwisterStatus.get_color(TwisterStatus.FAIL) if failed else TwisterStatus.get_color(TwisterStatus.PASS)}{results.passed}"
-            f" of {results.total - results.skipped_configs}{Fore.RESET}"
+            f" of {results.total - results.filtered_configs}{Fore.RESET}"
             f" executed test configurations passed ({pass_rate:.2%}),"
             f" {f'{TwisterStatus.get_color(TwisterStatus.NOTRUN)}{results.notrun}{Fore.RESET}' if results.notrun else f'{results.notrun}'} built (not run),"
             f" {f'{TwisterStatus.get_color(TwisterStatus.FAIL)}{results.failed}{Fore.RESET}' if results.failed else f'{results.failed}'} failed,"
@@ -623,7 +623,7 @@ def summary(self, results, ignore_unrecognized_sections, duration):
                     f'.'
                 )
 
-        built_only = results.total - run - results.skipped_configs
+        built_only = results.total - run - results.filtered_configs
         logger.info(f"{Fore.GREEN}{run}{Fore.RESET} test configurations executed on platforms, \
 {TwisterStatus.get_color(TwisterStatus.NOTRUN)}{built_only}{Fore.RESET} test configurations were only built.")
 

scripts/pylib/twister/twisterlib/runner.py

@@ -67,11 +67,11 @@ def __init__(self, total=0):
 
         total = yaml test scenarios * applicable platforms
         done := instances that reached report_out stage of the pipeline
-        done = skipped_configs + passed + failed + error
+        done = filtered_configs + passed + failed + error
         completed = done - skipped_filter
-        skipped_configs = skipped_runtime + skipped_filter
+        filtered_configs = skipped_runtime + skipped_filter
 
-        pass rate = passed / (total - skipped_configs)
+        pass rate = passed / (total - filtered_configs)
         case pass rate = passed_cases / (cases - filtered_cases - skipped_cases)
         '''
         # instances that go through the pipeline
@@ -91,7 +91,7 @@ def __init__(self, total=0):
 
         # static filter + runtime filter + build skipped
         # updated by update_counting_before_pipeline() and report_out()
-        self._skipped_configs = Value('i', 0)
+        self._filtered_configs = Value('i', 0)
 
         # cmake filter + build skipped
         # updated by report_out()
@@ -151,22 +151,22 @@ def summary(self):
         suites_n_length = self._find_number_length(self.total if self.total > self.done else self.done)
         processed_suites_n_length = self._find_number_length(self.done)
         completed_suites_n_length = self._find_number_length(completed_configs)
-        skipped_suites_n_length = self._find_number_length(self.skipped_configs)
+        skipped_suites_n_length = self._find_number_length(self.filtered_configs)
         total_cases_n_length = self._find_number_length(self.cases)
         selected_cases_n_length = self._find_number_length(selected_cases)
 
         print("--------------------------------------------------")
         print(f"{'Total test suites: ':<23}{self.total:>{suites_n_length}}") # actually test instances
         print(f"{'Processed test suites: ':<23}{self.done:>{suites_n_length}}")
         print(f"├─ {'Filtered test suites (static): ':<37}{self.skipped_filter:>{processed_suites_n_length}}")
-        print(f"└─ {'Completed test suites: ':<37}{completed_configs:>{processed_suites_n_length}}")
-        print(f"   ├─ {'Filtered test suites (at runtime): ':<37}{self.skipped_runtime:>{completed_suites_n_length}}")
+        print(f"└─ {'Selected test suites: ':<37}{completed_configs:>{processed_suites_n_length}}")
+        print(f"   ├─ {'Skipped test suites: ':<37}{self.skipped_runtime:>{completed_suites_n_length}}")
         print(f"   ├─ {'Passed test suites: ':<37}{self.passed:>{completed_suites_n_length}}")
         print(f"   ├─ {'Built only test suites: ':<37}{self.notrun:>{completed_suites_n_length}}")
         print(f"   ├─ {'Failed test suites: ':<37}{self.failed:>{completed_suites_n_length}}")
         print(f"   └─ {'Errors in test suites: ':<37}{self.error:>{completed_suites_n_length}}")
         print(f"")
-        print(f"{'Filtered test suites: ':<21}{self.skipped_configs}")
+        print(f"{'Filtered test suites: ':<21}{self.filtered_configs}")
         print(f"├─ {'Filtered test suites (static): ':<37}{self.skipped_filter:>{skipped_suites_n_length}}")
         print(f"└─ {'Filtered test suites (at runtime): ':<37}{self.skipped_runtime:>{skipped_suites_n_length}}")
         print("----------------------      ----------------------")
@@ -412,18 +412,18 @@ def notrun_increment(self, value=1):
             self._notrun.value += value
 
     @property
-    def skipped_configs(self):
-        with self._skipped_configs.get_lock():
-            return self._skipped_configs.value
+    def filtered_configs(self):
+        with self._filtered_configs.get_lock():
+            return self._filtered_configs.value
 
-    @skipped_configs.setter
-    def skipped_configs(self, value):
-        with self._skipped_configs.get_lock():
-            self._skipped_configs.value = value
+    @filtered_configs.setter
+    def filtered_configs(self, value):
+        with self._filtered_configs.get_lock():
+            self._filtered_configs.value = value
 
-    def skipped_configs_increment(self, value=1):
-        with self._skipped_configs.get_lock():
-            self._skipped_configs.value += value
+    def filtered_configs_increment(self, value=1):
+        with self._filtered_configs.get_lock():
+            self._filtered_configs.value += value
 
     @property
     def skipped_filter(self):
@@ -1381,9 +1381,9 @@ def report_out(self, results):
             if not self.options.verbose:
                 self.log_info_file(self.options.inline_logs)
         elif instance.status == TwisterStatus.SKIP:
-            results.skipped_configs_increment()
+            results.filtered_configs_increment()
         elif instance.status == TwisterStatus.FILTER:
-            results.skipped_configs_increment()
+            results.filtered_configs_increment()
         elif instance.status == TwisterStatus.PASS:
             results.passed_increment()
         elif instance.status == TwisterStatus.NOTRUN:
@@ -1439,8 +1439,8 @@ def report_out(self, results):
                 TwisterStatus.get_color(TwisterStatus.NOTRUN),
                 results.notrun,
                 Fore.RESET,
-                TwisterStatus.get_color(TwisterStatus.SKIP) if results.skipped_configs > 0 else Fore.RESET,
-                results.skipped_configs,
+                TwisterStatus.get_color(TwisterStatus.SKIP) if results.filtered_configs > 0 else Fore.RESET,
+                results.filtered_configs,
                 Fore.RESET,
                 TwisterStatus.get_color(TwisterStatus.FAIL) if results.failed > 0 else Fore.RESET,
                 results.failed,
@@ -1699,7 +1699,7 @@ def update_counting_before_pipeline(self):
         for instance in self.instances.values():
             if instance.status == TwisterStatus.FILTER and not instance.reason == 'runtime filter':
                 self.results.skipped_filter_increment()
-                self.results.skipped_configs_increment()
+                self.results.filtered_configs_increment()
                 self.results.filtered_cases_increment(len(instance.testsuite.testcases))
                 self.results.cases_increment(len(instance.testsuite.testcases))
             elif instance.status == TwisterStatus.ERROR:
@@ -1709,9 +1709,9 @@ def show_brief(self):
         logger.info("%d test scenarios (%d configurations) selected, "
                     "%d configurations filtered (%d by static filter, %d at runtime)." %
                     (len(self.suites), len(self.instances),
-                    self.results.skipped_configs,
+                    self.results.filtered_configs,
                     self.results.skipped_filter,
-                    self.results.skipped_configs - self.results.skipped_filter))
+                    self.results.filtered_configs - self.results.skipped_filter))
 
     def add_tasks_to_queue(self, pipeline, build_only=False, test_only=False, retry_build_errors=False):
         for instance in self.instances.values():

scripts/tests/twister/test_runner.py

@@ -194,7 +194,7 @@ def test_executioncounter(capfd):
     ec.iteration = 2
     ec.done = 9
     ec.passed = 6
-    ec.skipped_configs = 3
+    ec.filtered_configs = 3
     ec.skipped_runtime = 1
     ec.skipped_filter = 2
     ec.failed = 1
@@ -239,7 +239,7 @@ def test_executioncounter(capfd):
     assert ec.iteration == 2
     assert ec.done == 9
     assert ec.passed == 6
-    assert ec.skipped_configs == 3
+    assert ec.filtered_configs == 3
     assert ec.skipped_runtime == 1
     assert ec.skipped_filter == 2
     assert ec.failed == 1
@@ -2043,7 +2043,7 @@ def test_projectbuilder_report_out(
         passed = 17,
         notrun = 0,
         failed = 2,
-        skipped_configs = 3,
+        filtered_configs = 3,
         skipped_runtime = 0,
         skipped_filter = 0,
         error = 1,
@@ -2061,9 +2061,9 @@ def test_projectbuilder_report_out(
     def results_done_increment(value=1, decrement=False):
         results_mock.done += value * (-1 if decrement else 1)
     results_mock.done_increment = results_done_increment
-    def skipped_configs_increment(value=1, decrement=False):
-        results_mock.skipped_configs += value * (-1 if decrement else 1)
-    results_mock.skipped_configs_increment = skipped_configs_increment
+    def filtered_configs_increment(value=1, decrement=False):
+        results_mock.filtered_configs += value * (-1 if decrement else 1)
+    results_mock.filtered_configs_increment = filtered_configs_increment
     def skipped_filter_increment(value=1, decrement=False):
         results_mock.skipped_filter += value * (-1 if decrement else 1)
     results_mock.skipped_filter_increment = skipped_filter_increment
@@ -2566,7 +2566,7 @@ def test_twisterrunner_update_counting_before_pipeline():
         done = 0,
         passed = 0,
         failed = 0,
-        skipped_configs = 0,
+        filtered_configs = 0,
         skipped_runtime = 0,
         skipped_filter = 0,
         error = 0,
@@ -2580,9 +2580,9 @@ def test_twisterrunner_update_counting_before_pipeline():
         none_cases = 0,
         started_cases = 0
     )
-    def skipped_configs_increment(value=1, decrement=False):
-        tr.results.skipped_configs += value * (-1 if decrement else 1)
-    tr.results.skipped_configs_increment = skipped_configs_increment
+    def filtered_configs_increment(value=1, decrement=False):
+        tr.results.filtered_configs += value * (-1 if decrement else 1)
+    tr.results.filtered_configs_increment = filtered_configs_increment
     def skipped_filter_increment(value=1, decrement=False):
         tr.results.skipped_filter += value * (-1 if decrement else 1)
     tr.results.skipped_filter_increment = skipped_filter_increment
@@ -2599,7 +2599,7 @@ def filtered_cases_increment(value=1, decrement=False):
     tr.update_counting_before_pipeline()
 
     assert tr.results.skipped_filter == 1
-    assert tr.results.skipped_configs == 1
+    assert tr.results.filtered_configs == 1
     assert tr.results.filtered_cases == 4
     assert tr.results.cases == 4
     assert tr.results.error == 1
@@ -2619,7 +2619,7 @@ def test_twisterrunner_show_brief(caplog):
     tr = TwisterRunner(instances, suites, env=env_mock)
     tr.results = mock.Mock(
         skipped_filter = 3,
-        skipped_configs = 4,
+        filtered_configs = 4,
         skipped_cases = 0,
         cases = 0,
         error = 0