scripts: tests: twister: Domains tests fix

PR zephyrproject-rtos#63195 has changed how Domains work without
triggering necessary tests, thus breaking them.
This commit fixes the domains tests.

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

Author: LukaszMrugala

scripts/tests/twister/test_domains.py

@@ -23,21 +23,9 @@
     ('', False, 1, ['domains.yaml file not found: domains.yaml']),
     (
 """
-default: some default
-build_dir: my/dir
-domains:
-- name: some default
-  build_dir: dir/2
-- name: another
-  build_dir: dir/3
-flash_order: I don\'t think this is correct
-""",
-        True, 1, ['ERROR: Malformed yaml in file: domains.yaml']
-    ),
-    (
-"""
 default: None
 build_dir: some/dir
+domains: []
 """,
         True, None, []
     ),
@@ -46,7 +34,7 @@
 @pytest.mark.parametrize(
     'f_contents, f_exists, exit_code, expected_logs',
     TESTDATA_1,
-    ids=['no file', 'schema error', 'valid']
+    ids=['no file', 'valid']
 )
 def test_from_file(caplog, f_contents, f_exists, exit_code, expected_logs):
     def mock_open(*args, **kwargs):
@@ -71,43 +59,51 @@ def mock_open(*args, **kwargs):
 
 
 TESTDATA_2 = [
-    ({'build_dir': None, 'default': None}, True, None, [], None, {}),
     (
-        {
-            'build_dir': os.path.join('build', 'dir'),
-            'domains': [
-                {
-                    'name': 'a domain',
-                    'build_dir': os.path.join('dir', '1')
-                },
-                {
-                    'name': 'default_domain',
-                    'build_dir': os.path.join('dir', '2')
-                }
-            ],
-            'default': 'default_domain',
-            'flash_order': ['default_domain', 'a domain']
-        },
-        False,
-        os.path.join('build', 'dir'),
-        [('default_domain', os.path.join('dir', '2')),
-         ('a domain', os.path.join('dir', '1'))],
-        ('default_domain', os.path.join('dir', '2')),
-        {'a domain': ('a domain', os.path.join('dir', '1')),
-         'default_domain': ('default_domain', os.path.join('dir', '2'))}
+"""
+default: some default
+build_dir: my/dir
+domains:
+- name: some default
+  build_dir: dir/2
+- name: another
+  build_dir: dir/3
+flash_order: I don\'t think this is correct
+""",
+        1, None, None, None, None
+    ),
+    (
+"""
+build_dir: build/dir
+domains:
+- name: a domain
+  build_dir: dir/1
+- name: default_domain
+  build_dir: dir/2
+default: default_domain
+flash_order:
+- default_domain
+- a domain
+""",
+        None,
+        'build/dir',
+        [('default_domain', 'dir/2'), ('a domain', 'dir/1')],
+        ('default_domain', 'dir/2'),
+        {'a domain': ('a domain', 'dir/1'),
+         'default_domain': ('default_domain', 'dir/2')}
     ),
 ]
 
 @pytest.mark.parametrize(
-    'data, expect_warning, expected_build_dir, expected_flash_order,' \
+    'data, exit_code, expected_build_dir, expected_flash_order,' \
     ' expected_default, expected_domains',
     TESTDATA_2,
-    ids=['required only', 'with default domain']
+    ids=['invalid', 'valid']
 )
-def test_from_data(
+def test_from_yaml(
     caplog,
     data,
-    expect_warning,
+    exit_code,
     expected_build_dir,
     expected_flash_order,
     expected_default,
@@ -116,15 +112,13 @@ def test_from_data(
     def mock_domain(name, build_dir, *args, **kwargs):
         return name, build_dir
 
-    warning_log = "no domains defined; this probably won't work"
+    with mock.patch('domains.Domain', side_effect=mock_domain), \
+         pytest.raises(SystemExit) if exit_code else nullcontext() as exit_st:
+        doms = domains.Domains.from_yaml(data)
 
-    with mock.patch('domains.Domain', side_effect=mock_domain):
-        doms = domains.Domains.from_data(data)
-
-    if expect_warning:
-        assert warning_log in caplog.text
-    else:
-        assert warning_log not in caplog.text
+    if exit_code:
+        assert str(exit_st.value) == str(exit_code)
+        return
 
     assert doms.get_default_domain() == expected_default
     assert doms.get_top_build_dir() == expected_build_dir
@@ -139,50 +133,93 @@ def mock_domain(name, build_dir, *args, **kwargs):
     (
         None,
         True,
-        None,
-        [],
         [('some', os.path.join('dir', '2')),
          ('order', os.path.join('dir', '1'))]
     ),
     (
         None,
         False,
-        None,
-        [],
         [('order', os.path.join('dir', '1')),
          ('some', os.path.join('dir', '2'))]
     ),
-    (
-        ['some', 'other'],
-        False,
-        1,
-        ['domain other not found, valid domains are: order, some'],
-        [('some', os.path.join('dir', '2')),
-         ('order', os.path.join('dir', '1'))]
-    ),
     (
         ['some'],
         False,
-        None,
-        [],
         [('some', os.path.join('dir', '2'))]
     ),
 ]
 
 @pytest.mark.parametrize(
-    'names, default_flash_order, exit_code, expected_logs, expected_result',
+    'names, default_flash_order, expected_result',
     TESTDATA_3,
-    ids=['order only', 'no parameters', 'domain not found', 'valid']
+    ids=['order only', 'no parameters', 'valid']
 )
 def test_get_domains(
     caplog,
     names,
     default_flash_order,
+    expected_result
+):
+    doms = domains.Domains(
+"""
+domains:
+- name: dummy
+  build_dir: dummy
+default: dummy
+build_dir: dummy
+"""
+    )
+    doms._flash_order = [
+        ('some', os.path.join('dir', '2')),
+        ('order', os.path.join('dir', '1'))
+    ]
+    doms._domains = {
+        'order': ('order', os.path.join('dir', '1')),
+        'some': ('some', os.path.join('dir', '2'))
+    }
+
+    result = doms.get_domains(names, default_flash_order)
+
+    assert result == expected_result
+
+
+
+TESTDATA_3 = [
+    (
+        'other',
+        1,
+        ['domain "other" not found, valid domains are: order, some'],
+        None
+    ),
+    (
+        'some',
+        None,
+        [],
+        ('some', os.path.join('dir', '2'))
+    ),
+]
+
+@pytest.mark.parametrize(
+    'name, exit_code, expected_logs, expected_result',
+    TESTDATA_3,
+    ids=['domain not found', 'valid']
+)
+def test_get_domain(
+    caplog,
+    name,
     exit_code,
     expected_logs,
     expected_result
 ):
-    doms = domains.Domains({'domains': [], 'default': None})
+    doms = domains.Domains(
+"""
+domains:
+- name: dummy
+  build_dir: dummy
+default: dummy
+build_dir: dummy
+"""
+    )
     doms._flash_order = [
         ('some', os.path.join('dir', '2')),
         ('order', os.path.join('dir', '1'))
@@ -193,7 +230,7 @@ def test_get_domains(
     }
 
     with pytest.raises(SystemExit) if exit_code else nullcontext() as s_exit:
-        result = doms.get_domains(names, default_flash_order)
+        result = doms.get_domain(name)
 
     assert all([log in caplog.text for log in expected_logs])