twister: unittests: align tests with changes for shared apps

Fixed unittests after adding shared apps feature.

Signed-off-by: Grzegorz Chwierut <[email protected]>

Author: gchwier

scripts/tests/twister/test_handlers.py

@@ -1540,31 +1540,28 @@ def mock_process(pid):
     (
         True,
         os.path.join('self', 'dummy_dir', '1'),
-        mock.PropertyMock(return_value=os.path.join('dummy_dir', '1')),
-        os.path.join('dummy_dir', '1')
+        os.path.join('self', 'dummy_dir', '1', 'domain_name')
     ),
     (
         False,
         os.path.join('self', 'dummy_dir', '2'),
-        mock.PropertyMock(return_value=os.path.join('dummy_dir', '2')),
         os.path.join('self', 'dummy_dir', '2')
     ),
 ]
 
 @pytest.mark.parametrize(
-    'self_sysbuild, self_build_dir, build_dir, expected',
+    'self_sysbuild, self_build_dir, expected',
     TESTDATA_19,
     ids=['domains build dir', 'self build dir']
 )
 def test_qemuhandler_get_default_domain_build_dir(
     mocked_instance,
     self_sysbuild,
     self_build_dir,
-    build_dir,
     expected
 ):
     get_default_domain_mock = mock.Mock()
-    type(get_default_domain_mock()).build_dir = build_dir
+    type(get_default_domain_mock()).name = 'domain_name'
     domains_mock = mock.Mock(get_default_domain=get_default_domain_mock)
     from_file_mock = mock.Mock(return_value=domains_mock)
 

scripts/tests/twister/test_runner.py

@@ -11,12 +11,12 @@
 import os
 import pathlib
 import pytest
-import queue
 import re
 import subprocess
 import sys
 import yaml
 
+from collections import deque
 from contextlib import nullcontext
 from elftools.elf.sections import SymbolTableSection
 from typing import List
@@ -859,7 +859,7 @@ def mock_getsize(filename, *args, **kwargs):
 
 
 TESTDATA_6 = [
-    (
+    (  # filter, failed
         {'op': 'filter'},
         TwisterStatus.FAIL,
         'Failed',
@@ -881,7 +881,7 @@ def mock_getsize(filename, *args, **kwargs):
         0,
         None
     ),
-    (
+    (  # filter, cmake res
         {'op': 'filter'},
         TwisterStatus.PASS,
         mock.ANY,
@@ -903,7 +903,7 @@ def mock_getsize(filename, *args, **kwargs):
         1,
         (TwisterStatus.SKIP,)
     ),
-    (
+    (  # filter, no cmake res
         {'op': 'filter'},
         TwisterStatus.PASS,
         mock.ANY,
@@ -925,7 +925,7 @@ def mock_getsize(filename, *args, **kwargs):
         0,
         None
     ),
-    (
+    (  # cmake, failed
         {'op': 'cmake'},
         TwisterStatus.ERROR,
         'dummy error',
@@ -947,7 +947,7 @@ def mock_getsize(filename, *args, **kwargs):
         0,
         None
     ),
-    (
+    (  # cmake, cmake_only, no status
         {'op': 'cmake'},
         TwisterStatus.NONE,
         mock.ANY,
@@ -969,7 +969,7 @@ def mock_getsize(filename, *args, **kwargs):
         0,
         None
     ),
-    (
+    (  # cmake, cmake_only
         {'op': 'cmake'},
         'success',
         mock.ANY,
@@ -991,7 +991,7 @@ def mock_getsize(filename, *args, **kwargs):
         0,
         None
     ),
-    (
+    (  # cmake, no cmake_only, cmake res
         {'op': 'cmake'},
         'success',
         mock.ANY,
@@ -1013,7 +1013,7 @@ def mock_getsize(filename, *args, **kwargs):
         1,
         (TwisterStatus.SKIP,)
     ),
-    (
+    (  # cmake, no cmake_only, no cmake res
         {'op': 'cmake'},
         'success',
         mock.ANY,
@@ -1035,7 +1035,7 @@ def mock_getsize(filename, *args, **kwargs):
         0,
         None
     ),
-    (
+    (  # build, no build res
         {'op': 'build'},
         mock.ANY,
         None,
@@ -1057,7 +1057,7 @@ def mock_getsize(filename, *args, **kwargs):
         0,
         None
     ),
-    (
+    (  # build, skipped
         {'op': 'build'},
         TwisterStatus.SKIP,
         mock.ANY,
@@ -1080,7 +1080,7 @@ def mock_getsize(filename, *args, **kwargs):
         1,
         (TwisterStatus.SKIP, mock.ANY)
     ),
-    (
+    (  # build, blocked
         {'op': 'build'},
         TwisterStatus.PASS,
         mock.ANY,
@@ -1102,7 +1102,7 @@ def mock_getsize(filename, *args, **kwargs):
         0,
         (TwisterStatus.BLOCK, mock.ANY)
     ),
-    (
+    (  # build, determine testcases
         {'op': 'build'},
         'success',
         mock.ANY,
@@ -1125,7 +1125,7 @@ def mock_getsize(filename, *args, **kwargs):
         0,
         None
     ),
-    (
+    (  # build, determine testcases Error
         {'op': 'build'},
         'success',
         mock.ANY,
@@ -1148,7 +1148,7 @@ def mock_getsize(filename, *args, **kwargs):
         0,
         None
     ),
-    (
+    (  # gather metrics, run and ready handler
         {'op': 'gather_metrics'},
         mock.ANY,
         mock.ANY,
@@ -1169,8 +1169,8 @@ def mock_getsize(filename, *args, **kwargs):
         mock.ANY,
         0,
         None
-    ),  # 'gather metrics, run and ready handler'
-    (
+    ),
+    (  # gather metrics
         {'op': 'gather_metrics'},
         mock.ANY,
         mock.ANY,
@@ -1191,8 +1191,8 @@ def mock_getsize(filename, *args, **kwargs):
         mock.ANY,
         0,
         None
-    ),  # 'gather metrics'
-    (
+    ),
+    (  # build ok, gather metrics fail
         {'op': 'gather_metrics'},
         mock.ANY,
         mock.ANY,
@@ -1213,8 +1213,8 @@ def mock_getsize(filename, *args, **kwargs):
         'Build Failure at gather_metrics.',
         0,
         None
-    ),  # 'build ok, gather metrics fail',
-    (
+    ),
+    (  # run
         {'op': 'run'},
         'success',
         'OK',
@@ -1237,7 +1237,7 @@ def mock_getsize(filename, *args, **kwargs):
         0,
         None
     ),
-    (
+    (  # run, Pipeline Runtime Error
         {'op': 'run'},
         TwisterStatus.FAIL,
         mock.ANY,
@@ -1261,7 +1261,7 @@ def mock_getsize(filename, *args, **kwargs):
         0,
         None
     ),
-    (
+    (  # report, prep artifacts for testing
         {'op': 'report'},
         mock.ANY,
         mock.ANY,
@@ -1283,7 +1283,7 @@ def mock_getsize(filename, *args, **kwargs):
         0,
         None
     ),
-    (
+    (  # report, runtime artifact cleanup pass, status passed
         {'op': 'report'},
         TwisterStatus.PASS,
         mock.ANY,
@@ -1305,7 +1305,7 @@ def mock_getsize(filename, *args, **kwargs):
         0,
         None
     ),
-    (
+    ( # report, runtime artifact cleanup all
         {'op': 'report'},
         mock.ANY,
         mock.ANY,
@@ -1327,7 +1327,7 @@ def mock_getsize(filename, *args, **kwargs):
         0,
         None
     ),
-    (
+    (  # report, no message put
         {'op': 'report'},
         mock.ANY,
         mock.ANY,
@@ -1349,7 +1349,7 @@ def mock_getsize(filename, *args, **kwargs):
         0,
         None
     ),
-    (
+    (  # cleanup, device
         {'op': 'cleanup', 'mode': 'device'},
         mock.ANY,
         mock.ANY,
@@ -1371,7 +1371,7 @@ def mock_getsize(filename, *args, **kwargs):
         0,
         None
     ),
-    (
+    (  # cleanup, mode passed
         {'op': 'cleanup', 'mode': 'passed'},
         mock.ANY,
         mock.ANY,
@@ -1393,7 +1393,7 @@ def mock_getsize(filename, *args, **kwargs):
         0,
         None
     ),
-    (
+    (  # cleanup, mode all
         {'op': 'cleanup', 'mode': 'all'},
         mock.ANY,
         'Valgrind error',
@@ -1415,7 +1415,7 @@ def mock_getsize(filename, *args, **kwargs):
         0,
         None
     ),
-    (
+    (  # cleanup, mode all, cmake build failure
         {'op': 'cleanup', 'mode': 'all'},
         mock.ANY,
         'Cmake build failure',
@@ -1489,7 +1489,7 @@ def test_projectbuilder_process(
     expected_skipped,
     expected_missing
 ):
-    def mock_pipeline_put(msg):
+    def mock_pipeline_append(msg):
         if isinstance(pipeline_runtime_error, type) and \
            issubclass(pipeline_runtime_error, Exception):
             raise RuntimeError('Pipeline Error!')
@@ -1526,7 +1526,7 @@ def mock_determine_testcases(res):
     pb.run = mock.Mock()
     pb.gather_metrics = mock.Mock(return_value=metrics_res)
 
-    pipeline_mock = mock.Mock(put=mock.Mock(side_effect=mock_pipeline_put))
+    pipeline_mock = mock.Mock(append=mock.Mock(side_effect=mock_pipeline_append))
     done_mock = mock.Mock()
     lock_mock = mock.Mock(
         __enter__=mock.Mock(return_value=(mock.Mock(), mock.Mock())),
@@ -1540,7 +1540,7 @@ def mock_determine_testcases(res):
     assert all([log in caplog.text for log in expected_logs])
 
     if resulting_message:
-        pipeline_mock.put.assert_called_with(resulting_message)
+        pipeline_mock.append.assert_called_with(resulting_message)
 
     assert pb.instance.status == expected_status
     assert pb.instance.reason == expected_reason
@@ -2422,18 +2422,17 @@ def mock_client_from_environ(jobs):
     jobclient_mock = mock.Mock()
     jobclient_mock().name='JobClient'
 
-    pipeline_q = queue.LifoQueue()
-    done_q = queue.LifoQueue()
+    pipeline_q = deque()
+    done_q = dict()
     done_instance = mock.Mock(
         metrics={'k2': 'v2'},
         execution_time=30
     )
     done_instance.name='dummy instance'
-    done_q.put(done_instance)
+    done_q[done_instance.name] = done_instance
     manager_mock = mock.Mock()
-    manager_mock().LifoQueue = mock.Mock(
-        side_effect=iter([pipeline_q, done_q])
-    )
+    manager_mock().deque = mock.Mock(return_value=pipeline_q)
+    manager_mock().get_dict = mock.Mock(return_value=done_q)
 
     results_mock = mock.Mock()
     results_mock().error = 1
@@ -2586,11 +2585,11 @@ def mock_get_cmake_filter_stages(filter, keys):
         return [filter]
 
     instances = {
-        'dummy1': mock.Mock(run=True, retries=0, status=TwisterStatus.PASS, build_dir="/tmp"),
-        'dummy2': mock.Mock(run=True, retries=0, status=TwisterStatus.SKIP, build_dir="/tmp"),
-        'dummy3': mock.Mock(run=True, retries=0, status=TwisterStatus.FILTER, build_dir="/tmp"),
-        'dummy4': mock.Mock(run=True, retries=0, status=TwisterStatus.ERROR, build_dir="/tmp"),
-        'dummy5': mock.Mock(run=True, retries=0, status=TwisterStatus.FAIL, build_dir="/tmp")
+        'dummy1': mock.Mock(run=True, retries=0, status=TwisterStatus.PASS, build_dir="/tmp", no_own_image=False),
+        'dummy2': mock.Mock(run=True, retries=0, status=TwisterStatus.SKIP, build_dir="/tmp", no_own_image=False),
+        'dummy3': mock.Mock(run=True, retries=0, status=TwisterStatus.FILTER, build_dir="/tmp", no_own_image=False),
+        'dummy4': mock.Mock(run=True, retries=0, status=TwisterStatus.ERROR, build_dir="/tmp", no_own_image=False),
+        'dummy5': mock.Mock(run=True, retries=0, status=TwisterStatus.FAIL, build_dir="/tmp", no_own_image=False)
     }
     instances['dummy4'].testsuite.filter = 'some'
     instances['dummy5'].testsuite.filter = 'full'
@@ -2619,10 +2618,10 @@ def mock_get_cmake_filter_stages(filter, keys):
     if retry_build_errors:
         tr.get_cmake_filter_stages.assert_any_call('some', mock.ANY)
 
-    print(pipeline_mock.put.call_args_list)
+    print(pipeline_mock.append.call_args_list)
     print([mock.call(el) for el in expected_pipeline_elements])
 
-    assert pipeline_mock.put.call_args_list == \
+    assert pipeline_mock.append.call_args_list == \
            [mock.call(el) for el in expected_pipeline_elements]
 
 
@@ -2641,8 +2640,8 @@ def mock_get_nowait():
         nonlocal counter
         counter += 1
         if counter > 5:
-            raise queue.Empty()
-        return {'test': 'dummy'}
+            raise IndexError
+        return {'test': mock.Mock(required_images=False)}
 
     instances = {}
     suites = []
@@ -2656,7 +2655,7 @@ def mock_get_nowait():
     )
 
     pipeline_mock = mock.Mock()
-    pipeline_mock.get_nowait = mock.Mock(side_effect=mock_get_nowait)
+    pipeline_mock.pop = mock.Mock(side_effect=mock_get_nowait)
     done_queue_mock = mock.Mock()
     lock_mock = mock.Mock()
     results_mock = mock.Mock()