twisters: tests: adapt twister testsuite

Adapt tests for new changes in twister.

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

Author: nashif

scripts/tests/twister/test_runner.py

@@ -224,7 +224,7 @@ def test_executioncounter(capfd):
         'Total test cases: 25\n'
         '├─ Filtered test cases:  0\n'
         '├─ Skipped test cases:   6\n'
-        '└─ Executed test cases: 19\n'
+        '└─ Selected test cases: 19\n'
         '   ├─ Passed test cases:        0\n'
         '   ├─ Built only test cases:    0\n'
         '   ├─ Blocked test cases:       0\n'
@@ -914,8 +914,8 @@ def mock_getsize(filename, *args, **kwargs):
         {'op': 'report', 'test': mock.ANY},
         TwisterStatus.FILTER,
         'runtime filter',
-        1,
-        (TwisterStatus.SKIP,)
+        0,
+        (TwisterStatus.FILTER,)
     ),
     (
         {'op': 'filter'},
@@ -1025,7 +1025,7 @@ def mock_getsize(filename, *args, **kwargs):
         TwisterStatus.FILTER,
         'runtime filter',
         1,
-        (TwisterStatus.SKIP,)
+        (TwisterStatus.FILTER,) # this is a tuple
     ),
     (
         {'op': 'cmake'},
@@ -2627,7 +2627,7 @@ def test_twisterrunner_show_brief(caplog):
 
     tr.show_brief()
 
-    log = '2 test scenarios (5 test instances) selected,' \
+    log = '2 test scenarios (5 configurations) selected,' \
           ' 4 configurations filtered (3 by static filter, 1 at runtime).'
 
     assert log in caplog.text

scripts/tests/twister_blackbox/test_platform.py

@@ -37,7 +37,7 @@ class TestPlatform:
                 'failed_configurations': 0,
                 'errored_configurations': 0,
                 'executed_test_cases': 8,
-                'skipped_test_cases': 5,
+                'skipped_test_cases': 2,
                 'platform_count': 3,
                 'executed_on_platform': 4,
                 'only_built': 2
@@ -58,7 +58,7 @@ class TestPlatform:
                 'failed_configurations': 0,
                 'errored_configurations': 0,
                 'executed_test_cases': 0,
-                'skipped_test_cases': 3,
+                'skipped_test_cases': 0,
                 'platform_count': 3,
                 'executed_on_platform': 0,
                 'only_built': 0
@@ -264,7 +264,7 @@ def test_emulation_only(self, capfd, out_path, test_path, test_platforms, expect
             self.loader.exec_module(self.twister_module)
 
         select_regex = r'^INFO    - (?P<test_scenarios>[0-9]+) test scenarios' \
-                       r' \((?P<test_instances>[0-9]+) test instances\) selected,' \
+                       r' \((?P<test_instances>[0-9]+) configurations\) selected,' \
                        r' (?P<skipped_configurations>[0-9]+) configurations filtered' \
                        r' \((?P<skipped_by_static_filter>[0-9]+) by static filter,' \
                        r' (?P<skipped_at_runtime>[0-9]+) at runtime\)\.$'

scripts/tests/twister_blackbox/test_runner.py

@@ -260,7 +260,7 @@ def test_runtest_only(self, capfd, out_path, test_path, test_platforms, expected
 
 
         select_regex = r'^INFO    - (?P<test_scenarios>[0-9]+) test scenarios' \
-                       r' \((?P<test_instances>[0-9]+) test instances\) selected,' \
+                       r' \((?P<test_instances>[0-9]+) configurations\) selected,' \
                        r' (?P<skipped_configurations>[0-9]+) configurations filtered' \
                        r' \((?P<skipped_by_static_filter>[0-9]+) by static filter,' \
                        r' (?P<skipped_at_runtime>[0-9]+) at runtime\)\.$'
@@ -627,7 +627,7 @@ def test_only_failed(self, capfd, out_path, test_path, test_platforms, expected)
             self.loader.exec_module(self.twister_module)
 
         select_regex = r'^INFO    - (?P<test_scenarios>[0-9]+) test scenarios' \
-                       r' \((?P<test_instances>[0-9]+) test instances\) selected,' \
+                       r' \((?P<test_instances>[0-9]+) configurations\) selected,' \
                        r' (?P<skipped_configurations>[0-9]+) configurations filtered' \
                        r' \((?P<skipped_by_static_filter>[0-9]+) by static filter,' \
                        r' (?P<skipped_at_runtime>[0-9]+) at runtime\)\.$'