scripts: tests: Blackbox test expansion

Adds five new tests, covering six more flags:
* -s, --test
*     --sub-test
* -G, --integration
*     --test-config
*     --level
*     --filter

Signed-off-by: Lukasz Mrugala <[email protected]>

scripts/tests/twister_blackbox/test_data/test_config.yaml

@@ -0,0 +1,14 @@
+platforms:
+  override_default_platforms: false
+  increased_platform_scope: true
+levels:
+  - name: smoke
+    description: >
+      A plan to be used verifying basic features
+    adds:
+      - dummy.agnostic.*
+  - name: acceptance
+    description: >
+      More coverage
+    adds:
+      - dummy.*

scripts/tests/twister_blackbox/test_error.py

@@ -0,0 +1,63 @@
+#!/usr/bin/env python3
+# Copyright (c) 2024 Intel Corporation
+#
+# SPDX-License-Identifier: Apache-2.0
+"""
+Blackbox tests for twister's command line functions - simple does-error-out or not tests
+"""
+
+import importlib
+import mock
+import os
+import pytest
+import sys
+
+from conftest import ZEPHYR_BASE, TEST_DATA, testsuite_filename_mock
+from twisterlib.testplan import TestPlan
+from twisterlib.error import TwisterRuntimeError
+
+
+class TestError:
+    TESTDATA_1 = [
+        (
+            os.path.join('scripts', 'tests', 'twister_blackbox', 'test_data', 'tests',
+                         'dummy', 'agnostic', 'group1', 'subgroup1',
+                         'dummy.agnostic.group1.subgroup1'),
+            SystemExit
+        ),
+        ('dummy.agnostic.group1.subgroup1', TwisterRuntimeError),
+    ]
+
+    @classmethod
+    def setup_class(cls):
+        apath = os.path.join(ZEPHYR_BASE, 'scripts', 'twister')
+        cls.loader = importlib.machinery.SourceFileLoader('__main__', apath)
+        cls.spec = importlib.util.spec_from_loader(cls.loader.name, cls.loader)
+        cls.twister_module = importlib.util.module_from_spec(cls.spec)
+
+    @classmethod
+    def teardown_class(cls):
+        pass
+
+    @pytest.mark.usefixtures("clear_log")
+    @pytest.mark.parametrize(
+        'test, expected_exception',
+        TESTDATA_1,
+        ids=['valid', 'invalid']
+    )
+    @mock.patch.object(TestPlan, 'TESTSUITE_FILENAME', testsuite_filename_mock)
+    def test_test(self, out_path, test, expected_exception):
+        test_platforms = ['qemu_x86', 'frdm_k64f']
+        path = os.path.join(TEST_DATA, 'tests', 'dummy')
+        args = ['-i', '--outdir', out_path, '-T', path, '--test', test, '-y'] + \
+               [val for pair in zip(
+                   ['-p'] * len(test_platforms), test_platforms
+               ) for val in pair]
+
+        with mock.patch.object(sys, 'argv', [sys.argv[0]] + args), \
+                pytest.raises(expected_exception) as exc:
+            self.loader.exec_module(self.twister_module)
+
+        if expected_exception == SystemExit:
+            assert str(exc.value) == '0'
+        assert True

scripts/tests/twister_blackbox/test_testplan.py

@@ -0,0 +1,186 @@
+#!/usr/bin/env python3
+# Copyright (c) 2024 Intel Corporation
+#
+# SPDX-License-Identifier: Apache-2.0
+"""
+Blackbox tests for twister's command line functions - those requiring testplan.json
+"""
+
+import importlib
+import mock
+import os
+import pytest
+import sys
+import json
+
+from conftest import ZEPHYR_BASE, TEST_DATA, testsuite_filename_mock
+from twisterlib.testplan import TestPlan
+from twisterlib.error import TwisterRuntimeError
+
+
+class TestTestPlan:
+    TESTDATA_1 = [
+        ('smoke', 5),
+        ('acceptance', 6),
+    ]
+    TESTDATA_2 = [
+        ('dummy.agnostic.group2.assert1', SystemExit, 3),
+        (
+            os.path.join('scripts', 'tests', 'twister_blackbox', 'test_data', 'tests',
+                         'dummy', 'agnostic', 'group1', 'subgroup1',
+                         'dummy.agnostic.group2.assert1'),
+            TwisterRuntimeError,
+            None
+        ),
+    ]
+    TESTDATA_3 = [
+        ('buildable', 6),
+        ('runnable', 5),
+    ]
+    TESTDATA_4 = [
+        (True, 1),
+        (False, 6),
+    ]
+
+    @classmethod
+    def setup_class(cls):
+        apath = os.path.join(ZEPHYR_BASE, 'scripts', 'twister')
+        cls.loader = importlib.machinery.SourceFileLoader('__main__', apath)
+        cls.spec = importlib.util.spec_from_loader(cls.loader.name, cls.loader)
+        cls.twister_module = importlib.util.module_from_spec(cls.spec)
+
+    @classmethod
+    def teardown_class(cls):
+        pass
+
+    @pytest.mark.usefixtures("clear_log")
+    @pytest.mark.parametrize(
+        'level, expected_tests',
+        TESTDATA_1,
+        ids=['smoke', 'acceptance']
+    )
+    @mock.patch.object(TestPlan, 'TESTSUITE_FILENAME', testsuite_filename_mock)
+    def test_level(self, out_path, level, expected_tests):
+        test_platforms = ['qemu_x86', 'frdm_k64f']
+        path = os.path.join(TEST_DATA, 'tests')
+        config_path = os.path.join(TEST_DATA, 'test_config.yaml')
+        args = ['-i','--outdir', out_path, '-T', path, '--level', level, '-y',
+                '--test-config', config_path] + \
+               [val for pair in zip(
+                   ['-p'] * len(test_platforms), test_platforms
+               ) for val in pair]
+
+        with mock.patch.object(sys, 'argv', [sys.argv[0]] + args), \
+                pytest.raises(SystemExit) as sys_exit:
+            self.loader.exec_module(self.twister_module)
+
+        with open(os.path.join(out_path, 'testplan.json')) as f:
+            j = json.load(f)
+        filtered_j = [
+            (ts['platform'], ts['name'], tc['identifier']) \
+                for ts in j['testsuites'] \
+                for tc in ts['testcases'] if 'reason' not in tc
+        ]
+
+        assert str(sys_exit.value) == '0'
+
+        assert expected_tests == len(filtered_j)
+
+    @pytest.mark.usefixtures("clear_log")
+    @pytest.mark.parametrize(
+        'test, expected_exception, expected_subtest_count',
+        TESTDATA_2,
+        ids=['valid', 'invalid']
+    )
+    @mock.patch.object(TestPlan, 'TESTSUITE_FILENAME', testsuite_filename_mock)
+    def test_subtest(self, out_path, test, expected_exception, expected_subtest_count):
+        test_platforms = ['qemu_x86', 'frdm_k64f']
+        path = os.path.join(TEST_DATA, 'tests', 'dummy')
+        args = ['-i', '--outdir', out_path, '-T', path, '--sub-test', test, '-y'] + \
+               [val for pair in zip(
+                   ['-p'] * len(test_platforms), test_platforms
+               ) for val in pair]
+
+        with mock.patch.object(sys, 'argv', [sys.argv[0]] + args), \
+                pytest.raises(expected_exception) as exc:
+            self.loader.exec_module(self.twister_module)
+
+        if expected_exception != SystemExit:
+            assert True
+            return
+
+        with open(os.path.join(out_path, 'testplan.json')) as f:
+            j = json.load(f)
+        filtered_j = [
+            (ts['platform'], ts['name'], tc['identifier']) \
+                for ts in j['testsuites'] \
+                for tc in ts['testcases'] if 'reason' not in tc
+        ]
+
+        assert str(exc.value) == '0'
+        assert len(filtered_j) == expected_subtest_count
+
+
+    @pytest.mark.usefixtures("clear_log")
+    @pytest.mark.parametrize(
+        'filter, expected_count',
+        TESTDATA_3,
+        ids=['buildable', 'runnable']
+    )
+    @mock.patch.object(TestPlan, 'TESTSUITE_FILENAME', testsuite_filename_mock)
+    def test_filter(self, out_path, filter, expected_count):
+        test_platforms = ['qemu_x86', 'frdm_k64f']
+        path = os.path.join(TEST_DATA, 'tests', 'dummy')
+        args = ['-i', '--outdir', out_path, '-T', path, '--filter', filter, '-y'] + \
+               [val for pair in zip(
+                   ['-p'] * len(test_platforms), test_platforms
+               ) for val in pair]
+
+        with mock.patch.object(sys, 'argv', [sys.argv[0]] + args), \
+                pytest.raises(SystemExit) as exc:
+            self.loader.exec_module(self.twister_module)
+
+        assert str(exc.value) == '0'
+
+        with open(os.path.join(out_path, 'testplan.json')) as f:
+            j = json.load(f)
+        filtered_j = [
+            (ts['platform'], ts['name'], tc['identifier']) \
+                for ts in j['testsuites'] \
+                for tc in ts['testcases'] if 'reason' not in tc
+        ]
+
+        assert expected_count == len(filtered_j)
+
+    @pytest.mark.usefixtures("clear_log")
+    @pytest.mark.parametrize(
+        'integration, expected_count',
+        TESTDATA_4,
+        ids=['integration', 'no integration']
+    )
+    @mock.patch.object(TestPlan, 'TESTSUITE_FILENAME', testsuite_filename_mock)
+    @mock.patch.object(TestPlan, 'SAMPLE_FILENAME', '')
+    def test_integration(self, out_path, integration, expected_count):
+        test_platforms = ['qemu_x86', 'frdm_k64f']
+        path = os.path.join(TEST_DATA, 'tests', 'dummy')
+        args = ['-i', '--outdir', out_path, '-T', path, '-y'] + \
+               (['--integration'] if integration else []) + \
+               [val for pair in zip(
+                   ['-p'] * len(test_platforms), test_platforms
+               ) for val in pair]
+
+        with mock.patch.object(sys, 'argv', [sys.argv[0]] + args), \
+                pytest.raises(SystemExit) as exc:
+            self.loader.exec_module(self.twister_module)
+
+        assert str(exc.value) == '0'
+
+        with open(os.path.join(out_path, 'testplan.json')) as f:
+            j = json.load(f)
+        filtered_j = [
+            (ts['platform'], ts['name'], tc['identifier']) \
+                for ts in j['testsuites'] \
+                for tc in ts['testcases'] if 'reason' not in tc
+        ]
+
+        assert expected_count == len(filtered_j)