diff --git a/scripts/build/check_init_priorities_test.py b/scripts/build/check_init_priorities_test.py index 16cf9af7406..7ada2349839 100755 --- a/scripts/build/check_init_priorities_test.py +++ b/scripts/build/check_init_priorities_test.py @@ -6,7 +6,7 @@ Tests for check_init_priorities """ -import mock +from unittest import mock import pathlib import unittest diff --git a/scripts/requirements-actions.txt b/scripts/requirements-actions.txt index 7e925010918..1af5b8267d5 100644 --- a/scripts/requirements-actions.txt +++ b/scripts/requirements-actions.txt @@ -653,10 +653,6 @@ mccabe==0.7.0 \ --hash=sha256:348e0240c33b60bbdf4e523192ef919f28cb2c3d7d5c7794f74009290f236325 \ --hash=sha256:6c2d30ab6be0e4a46919781807b4f0d834ebdd6c6e3dca0bda5a15f863427b6e # via pylint -mock==5.2.0 \ - --hash=sha256:4e460e818629b4b173f32d08bf30d3af8123afbb8e04bb5707a1fd4799e503f0 \ - --hash=sha256:7ba87f72ca0e915175596069dbbcc7c75af7b5e9b9bc107ad6349ede0819982f - # via -r requirements-actions.in msgpack==1.1.1 ; sys_platform != 'win32' \ --hash=sha256:196a736f0526a03653d829d7d4c5500a97eea3648aebfd4b6743875f28aa2af8 \ --hash=sha256:1abfc6e949b352dadf4bce0eb78023212ec5ac42f6abfd469ce91d783c149c2a \ diff --git a/scripts/requirements-build-test.txt b/scripts/requirements-build-test.txt index 0d540dd05c3..76cee431f88 100644 --- a/scripts/requirements-build-test.txt +++ b/scripts/requirements-build-test.txt @@ -17,8 +17,5 @@ coverage pytest mypy -# used for mocking functions in pytest -mock>=4.0.1 - # used for JUnit XML parsing in CTest harness junitparser diff --git a/scripts/tests/build_helpers/test_domains.py b/scripts/tests/build_helpers/test_domains.py index b22fff44916..de784734bac 100644 --- a/scripts/tests/build_helpers/test_domains.py +++ b/scripts/tests/build_helpers/test_domains.py @@ -6,10 +6,10 @@ Tests for domains.py classes """ -import mock import os import sys from contextlib import nullcontext +from unittest import mock import pytest diff --git a/scripts/tests/twister/test_cmakecache.py b/scripts/tests/twister/test_cmakecache.py index ebfb440423b..51a09a58102 100644 --- a/scripts/tests/twister/test_cmakecache.py +++ b/scripts/tests/twister/test_cmakecache.py @@ -6,7 +6,7 @@ Tests for cmakecache.py classes' methods """ -import mock +from unittest import mock import pytest from contextlib import nullcontext diff --git a/scripts/tests/twister/test_config_parser.py b/scripts/tests/twister/test_config_parser.py index 48a2d5a7db5..dcc1495ab7c 100644 --- a/scripts/tests/twister/test_config_parser.py +++ b/scripts/tests/twister/test_config_parser.py @@ -9,7 +9,7 @@ Tests for config_parser.py import os import pytest -import mock +from unittest import mock import scl from twisterlib.config_parser import TwisterConfigParser, extract_fields_from_arg_list, ConfigurationError diff --git a/scripts/tests/twister/test_environment.py b/scripts/tests/twister/test_environment.py index 3a4e090598b..95b799bc8b7 100644 --- a/scripts/tests/twister/test_environment.py +++ b/scripts/tests/twister/test_environment.py @@ -7,7 +7,7 @@ Tests for environment.py classes' methods """ -import mock +from unittest import mock import os import pytest import shutil diff --git a/scripts/tests/twister/test_handlers.py b/scripts/tests/twister/test_handlers.py index e4710060a35..fbe22bb906f 100644 --- a/scripts/tests/twister/test_handlers.py +++ b/scripts/tests/twister/test_handlers.py @@ -8,7 +8,7 @@ Tests for handlers.py classes' methods """ import itertools -import mock +from unittest import mock import os import pytest import signal diff --git a/scripts/tests/twister/test_hardwaremap.py b/scripts/tests/twister/test_hardwaremap.py index 5dc61dc1d9e..c8f82679211 100644 --- a/scripts/tests/twister/test_hardwaremap.py +++ b/scripts/tests/twister/test_hardwaremap.py @@ -6,7 +6,7 @@ Tests for hardwaremap.py classes' methods """ -import mock +from unittest import mock import pytest import sys diff --git a/scripts/tests/twister/test_harness.py b/scripts/tests/twister/test_harness.py index 3283ff2085a..edc2a96c8a1 100644 --- a/scripts/tests/twister/test_harness.py +++ b/scripts/tests/twister/test_harness.py @@ -6,7 +6,7 @@ """ This test file contains testsuites for the Harness classes of twister """ -import mock +from unittest import mock import sys import os import pytest diff --git a/scripts/tests/twister/test_jobserver.py b/scripts/tests/twister/test_jobserver.py index 554df8545fb..d365313199d 100644 --- a/scripts/tests/twister/test_jobserver.py +++ b/scripts/tests/twister/test_jobserver.py @@ -7,7 +7,7 @@ Tests for jobserver.py classes' methods """ import functools -import mock +from unittest import mock import os import pytest import sys diff --git a/scripts/tests/twister/test_log_helper.py b/scripts/tests/twister/test_log_helper.py index 9373be5da2f..31d7c6148da 100644 --- a/scripts/tests/twister/test_log_helper.py +++ b/scripts/tests/twister/test_log_helper.py @@ -7,7 +7,7 @@ Tests for log_helper.py functions """ import logging -import mock +from unittest import mock import pytest from importlib import reload diff --git a/scripts/tests/twister/test_platform.py b/scripts/tests/twister/test_platform.py index cdbfd15d20c..1ff7f0bb8fd 100644 --- a/scripts/tests/twister/test_platform.py +++ b/scripts/tests/twister/test_platform.py @@ -8,7 +8,7 @@ This test file contains tests for platform.py module of twister ''' import sys import os -import mock +from unittest import mock import pytest from contextlib import nullcontext diff --git a/scripts/tests/twister/test_quarantine.py b/scripts/tests/twister/test_quarantine.py index ea6b3cf677e..6165a755544 100644 --- a/scripts/tests/twister/test_quarantine.py +++ b/scripts/tests/twister/test_quarantine.py @@ -6,7 +6,7 @@ Tests for quarantine.py classes' methods """ -import mock +from unittest import mock import os import pytest import textwrap diff --git a/scripts/tests/twister/test_runner.py b/scripts/tests/twister/test_runner.py index e5aa7f7ee72..5530b6e4707 100644 --- a/scripts/tests/twister/test_runner.py +++ b/scripts/tests/twister/test_runner.py @@ -7,7 +7,7 @@ Tests for runner.py classes """ import errno -import mock +from unittest import mock import os import pathlib import pytest diff --git a/scripts/tests/twister/test_scl.py b/scripts/tests/twister/test_scl.py index 14a0c447192..4a376257b1d 100644 --- a/scripts/tests/twister/test_scl.py +++ b/scripts/tests/twister/test_scl.py @@ -7,7 +7,7 @@ Tests for scl.py functions """ import logging -import mock +from unittest import mock import os import pytest import sys diff --git a/scripts/tests/twister/test_testinstance.py b/scripts/tests/twister/test_testinstance.py index 271d55e76a0..df8286fe092 100644 --- a/scripts/tests/twister/test_testinstance.py +++ b/scripts/tests/twister/test_testinstance.py @@ -11,7 +11,7 @@ from contextlib import nullcontext import os import sys import pytest -import mock +from unittest import mock ZEPHYR_BASE = os.getenv("ZEPHYR_BASE") sys.path.insert(0, os.path.join(ZEPHYR_BASE, "scripts/pylib/twister")) diff --git a/scripts/tests/twister/test_testplan.py b/scripts/tests/twister/test_testplan.py index 31fde15c5d8..60f1ddd9437 100644 --- a/scripts/tests/twister/test_testplan.py +++ b/scripts/tests/twister/test_testplan.py @@ -8,7 +8,7 @@ This test file contains testsuites for testsuite.py module of twister ''' import sys import os -import mock +from unittest import mock import pytest from contextlib import nullcontext diff --git a/scripts/tests/twister/test_testsuite.py b/scripts/tests/twister/test_testsuite.py index 83231c0f48a..635b2aaa99f 100644 --- a/scripts/tests/twister/test_testsuite.py +++ b/scripts/tests/twister/test_testsuite.py @@ -7,7 +7,7 @@ Tests for testinstance class """ import mmap -import mock +from unittest import mock import os import pytest import sys diff --git a/scripts/tests/twister/test_twister.py b/scripts/tests/twister/test_twister.py index 23a3e6d17db..0e5118751dd 100644 --- a/scripts/tests/twister/test_twister.py +++ b/scripts/tests/twister/test_twister.py @@ -9,7 +9,7 @@ This test file contains foundational testcases for Twister tool import os import sys -import mock +from unittest import mock import pytest from pathlib import Path diff --git a/scripts/tests/twister_blackbox/conftest.py b/scripts/tests/twister_blackbox/conftest.py index 0fd73927c6f..615e2f986b7 100644 --- a/scripts/tests/twister_blackbox/conftest.py +++ b/scripts/tests/twister_blackbox/conftest.py @@ -7,7 +7,7 @@ import logging import shutil -import mock +from unittest import mock import os import pytest import sys diff --git a/scripts/tests/twister_blackbox/test_addon.py b/scripts/tests/twister_blackbox/test_addon.py index ecd34501b73..bb7fe84b6b8 100644 --- a/scripts/tests/twister_blackbox/test_addon.py +++ b/scripts/tests/twister_blackbox/test_addon.py @@ -7,7 +7,7 @@ Blackbox tests for twister's command line functions concerning addons to normal """ import importlib -import mock +from unittest import mock import os import pkg_resources import pytest @@ -16,6 +16,7 @@ import shutil import subprocess import sys +# pylint: disable=no-name-in-module from conftest import ZEPHYR_BASE, TEST_DATA, sample_filename_mock, testsuite_filename_mock from twisterlib.testplan import TestPlan diff --git a/scripts/tests/twister_blackbox/test_config.py b/scripts/tests/twister_blackbox/test_config.py index 2cad497055f..1b34e637ff4 100644 --- a/scripts/tests/twister_blackbox/test_config.py +++ b/scripts/tests/twister_blackbox/test_config.py @@ -7,7 +7,7 @@ Blackbox tests for twister's command line functions related to test configuratio """ import importlib -import mock +from unittest import mock import os import pytest import sys diff --git a/scripts/tests/twister_blackbox/test_coverage.py b/scripts/tests/twister_blackbox/test_coverage.py index aeb41e63daf..c1f85c05057 100644 --- a/scripts/tests/twister_blackbox/test_coverage.py +++ b/scripts/tests/twister_blackbox/test_coverage.py @@ -7,7 +7,7 @@ Blackbox tests for twister's command line functions """ import importlib import re -import mock +from unittest import mock import os import pytest import sys diff --git a/scripts/tests/twister_blackbox/test_device.py b/scripts/tests/twister_blackbox/test_device.py index 790e0774e30..c35daa337e4 100644 --- a/scripts/tests/twister_blackbox/test_device.py +++ b/scripts/tests/twister_blackbox/test_device.py @@ -7,7 +7,7 @@ Blackbox tests for twister's command line functions related to test filtering. """ import importlib -import mock +from unittest import mock import os import pytest import sys diff --git a/scripts/tests/twister_blackbox/test_disable.py b/scripts/tests/twister_blackbox/test_disable.py index 26e804af9d4..3cbc7d31428 100644 --- a/scripts/tests/twister_blackbox/test_disable.py +++ b/scripts/tests/twister_blackbox/test_disable.py @@ -8,11 +8,12 @@ Blackbox tests for twister's command line functions related to disable features. import importlib import pytest -import mock +from unittest import mock import os import sys import re +# pylint: disable=no-name-in-module from conftest import ZEPHYR_BASE, TEST_DATA, testsuite_filename_mock from twisterlib.testplan import TestPlan diff --git a/scripts/tests/twister_blackbox/test_error.py b/scripts/tests/twister_blackbox/test_error.py index 4a28f7fb178..93d589fefdf 100644 --- a/scripts/tests/twister_blackbox/test_error.py +++ b/scripts/tests/twister_blackbox/test_error.py @@ -7,7 +7,7 @@ Blackbox tests for twister's command line functions - simple does-error-out or n """ import importlib -import mock +from unittest import mock import os import pytest import sys diff --git a/scripts/tests/twister_blackbox/test_filter.py b/scripts/tests/twister_blackbox/test_filter.py index f7e3ff8f21f..c65dda1604c 100644 --- a/scripts/tests/twister_blackbox/test_filter.py +++ b/scripts/tests/twister_blackbox/test_filter.py @@ -7,7 +7,7 @@ Blackbox tests for twister's command line functions related to test filtering. """ import importlib -import mock +from unittest import mock import os import pytest import sys diff --git a/scripts/tests/twister_blackbox/test_footprint.py b/scripts/tests/twister_blackbox/test_footprint.py index 35824d792b1..b9e072a2666 100644 --- a/scripts/tests/twister_blackbox/test_footprint.py +++ b/scripts/tests/twister_blackbox/test_footprint.py @@ -8,7 +8,7 @@ Blackbox tests for twister's command line functions related to memory footprints import importlib import json -import mock +from unittest import mock import os import pytest import sys diff --git a/scripts/tests/twister_blackbox/test_hardwaremap.py b/scripts/tests/twister_blackbox/test_hardwaremap.py index c1f6ff1eaf8..ce3493415a9 100644 --- a/scripts/tests/twister_blackbox/test_hardwaremap.py +++ b/scripts/tests/twister_blackbox/test_hardwaremap.py @@ -6,11 +6,12 @@ Blackbox tests for twister's command line functions """ import importlib -import mock +from unittest import mock import os import pytest import sys +# pylint: disable=no-name-in-module from conftest import ZEPHYR_BASE, testsuite_filename_mock, clear_log_in_test from twisterlib.testplan import TestPlan diff --git a/scripts/tests/twister_blackbox/test_outfile.py b/scripts/tests/twister_blackbox/test_outfile.py index 590e0c8f58a..bdaa5d3291d 100644 --- a/scripts/tests/twister_blackbox/test_outfile.py +++ b/scripts/tests/twister_blackbox/test_outfile.py @@ -8,7 +8,7 @@ Blackbox tests for twister's command line functions changing the output files. import importlib import re -import mock +from unittest import mock import os import shutil import pytest diff --git a/scripts/tests/twister_blackbox/test_output.py b/scripts/tests/twister_blackbox/test_output.py index 5babfa96620..c6a77020638 100644 --- a/scripts/tests/twister_blackbox/test_output.py +++ b/scripts/tests/twister_blackbox/test_output.py @@ -8,7 +8,7 @@ Blackbox tests for twister's command line functions changing test output. import importlib import re -import mock +from unittest import mock import os import pytest import sys diff --git a/scripts/tests/twister_blackbox/test_platform.py b/scripts/tests/twister_blackbox/test_platform.py index 0c644dcff5a..33239d5fcc0 100644 --- a/scripts/tests/twister_blackbox/test_platform.py +++ b/scripts/tests/twister_blackbox/test_platform.py @@ -8,7 +8,7 @@ Blackbox tests for twister's command line functions related to Zephyr platforms. import importlib import re -import mock +from unittest import mock import os import pytest import sys diff --git a/scripts/tests/twister_blackbox/test_printouts.py b/scripts/tests/twister_blackbox/test_printouts.py index 8f07a0fd3aa..f383fe09744 100644 --- a/scripts/tests/twister_blackbox/test_printouts.py +++ b/scripts/tests/twister_blackbox/test_printouts.py @@ -7,7 +7,7 @@ Blackbox tests for twister's command line functions """ import importlib -import mock +from unittest import mock import os import pytest import sys diff --git a/scripts/tests/twister_blackbox/test_quarantine.py b/scripts/tests/twister_blackbox/test_quarantine.py index 0b4c6cdafec..c2b6a183266 100644 --- a/scripts/tests/twister_blackbox/test_quarantine.py +++ b/scripts/tests/twister_blackbox/test_quarantine.py @@ -7,7 +7,7 @@ Blackbox tests for twister's command line functions related to the quarantine. """ import importlib -import mock +from unittest import mock import os import pytest import re diff --git a/scripts/tests/twister_blackbox/test_report.py b/scripts/tests/twister_blackbox/test_report.py index 83d5942c855..ab2aec447ec 100644 --- a/scripts/tests/twister_blackbox/test_report.py +++ b/scripts/tests/twister_blackbox/test_report.py @@ -8,7 +8,7 @@ Blackbox tests for twister's command line functions import importlib import json -import mock +from unittest import mock import os import pytest import shutil diff --git a/scripts/tests/twister_blackbox/test_runner.py b/scripts/tests/twister_blackbox/test_runner.py index 57ecef3fbfe..09286663475 100644 --- a/scripts/tests/twister_blackbox/test_runner.py +++ b/scripts/tests/twister_blackbox/test_runner.py @@ -8,7 +8,7 @@ Blackbox tests for twister's command line functions # pylint: disable=duplicate-code import importlib -import mock +from unittest import mock import os import pytest import re diff --git a/scripts/tests/twister_blackbox/test_shuffle.py b/scripts/tests/twister_blackbox/test_shuffle.py index f45724b7b55..ba19faf64b6 100644 --- a/scripts/tests/twister_blackbox/test_shuffle.py +++ b/scripts/tests/twister_blackbox/test_shuffle.py @@ -7,7 +7,7 @@ Blackbox tests for twister's command line functions related to the shuffling of """ import importlib -import mock +from unittest import mock import os import pytest import sys diff --git a/scripts/tests/twister_blackbox/test_testlist.py b/scripts/tests/twister_blackbox/test_testlist.py index ad8eaeddfaf..410c417e14c 100644 --- a/scripts/tests/twister_blackbox/test_testlist.py +++ b/scripts/tests/twister_blackbox/test_testlist.py @@ -7,7 +7,7 @@ Blackbox tests for twister's command line functions related to saving and loadin """ import importlib -import mock +from unittest import mock import os import pytest import sys diff --git a/scripts/tests/twister_blackbox/test_testplan.py b/scripts/tests/twister_blackbox/test_testplan.py index 8834e03ead0..701acf94ddf 100644 --- a/scripts/tests/twister_blackbox/test_testplan.py +++ b/scripts/tests/twister_blackbox/test_testplan.py @@ -7,7 +7,7 @@ Blackbox tests for twister's command line functions - those requiring testplan.j """ import importlib -import mock +from unittest import mock import os import pytest import sys diff --git a/scripts/tests/twister_blackbox/test_tooling.py b/scripts/tests/twister_blackbox/test_tooling.py index 3979517e2da..d844ec824de 100644 --- a/scripts/tests/twister_blackbox/test_tooling.py +++ b/scripts/tests/twister_blackbox/test_tooling.py @@ -8,12 +8,13 @@ Blackbox tests for twister's command line functions related to Twister's tooling # pylint: disable=duplicate-code import importlib -import mock +from unittest import mock import os import pytest import sys import json +# pylint: disable=no-name-in-module from conftest import ZEPHYR_BASE, TEST_DATA, sample_filename_mock, testsuite_filename_mock from twisterlib.statuses import TwisterStatus from twisterlib.testplan import TestPlan