michaelh/zephyr
1
0
Fork 0
Code Releases Activity

scripts: tests: Remove test_harness straggling dirs

Browse source 
Current test_harness after its expansion leaves straggling
mock_platform directory. This fixes that error.

Signed-off-by: Lukasz Mrugala <lukaszx.mrugala@intel.com>
This commit is contained in:
Lukasz Mrugala 2024-03-21 14:11:04 +00:00 • committed by Alberto Escolar
commit ccd3612575
1 changed files with 41 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

57
scripts/tests/twister/test_harness.py
View file

@ -73,7 +73,7 @@ def test_harness_process_test(line, fault, fail_on_fault, cap_cov, exp_stat, exp
assert harness.capture_coverage == cap_cov assert harness.capture_coverage == cap_cov
def test_robot_configure(): def test_robot_configure(tmp_path):
#Arrange #Arrange
mock_platform = mock.Mock() mock_platform = mock.Mock()
mock_platform.name = "mock_platform" mock_platform.name = "mock_platform"
@ -83,7 +83,10 @@ def test_robot_configure():
mock_testsuite.name = "mock_testsuite" mock_testsuite.name = "mock_testsuite"
mock_testsuite.harness_config = {} mock_testsuite.harness_config = {}
instance = TestInstance(testsuite=mock_testsuite, platform=mock_platform, outdir="") outdir = tmp_path / 'gtest_out'
outdir.mkdir()
instance = TestInstance(testsuite=mock_testsuite, platform=mock_platform, outdir=outdir)
instance.testsuite.harness_config = { instance.testsuite.harness_config = {
'robot_test_path': '/path/to/robot/test' 'robot_test_path': '/path/to/robot/test'
} }
@ -97,7 +100,7 @@ def test_robot_configure():
assert robot_harness.path == '/path/to/robot/test' assert robot_harness.path == '/path/to/robot/test'
def test_robot_handle(): def test_robot_handle(tmp_path):
#Arrange #Arrange
mock_platform = mock.Mock() mock_platform = mock.Mock()
mock_platform.name = "mock_platform" mock_platform.name = "mock_platform"
@ -107,7 +110,10 @@ def test_robot_handle():
mock_testsuite.name = "mock_testsuite" mock_testsuite.name = "mock_testsuite"
mock_testsuite.harness_config = {} mock_testsuite.harness_config = {}
instance = TestInstance(testsuite=mock_testsuite, platform=mock_platform, outdir="") outdir = tmp_path / 'gtest_out'
outdir.mkdir()
instance = TestInstance(testsuite=mock_testsuite, platform=mock_platform, outdir=outdir)
handler = Robot() handler = Robot()
handler.instance = instance handler.instance = instance
@ -130,7 +136,7 @@ TEST_DATA_2 = [("", 0, "passed"), ("Robot test failure: sourcedir for mock_platf
TEST_DATA_2, TEST_DATA_2,
ids=["passed", "failed"] ids=["passed", "failed"]
) )
def test_robot_run_robot_test(caplog, exp_out, returncode, expected_status): def test_robot_run_robot_test(tmp_path, caplog, exp_out, returncode, expected_status):
# Arrange # Arrange
command = "command" command = "command"
@ -148,7 +154,10 @@ def test_robot_run_robot_test(caplog, exp_out, returncode, expected_status):
mock_testsuite.name = "mock_testsuite" mock_testsuite.name = "mock_testsuite"
mock_testsuite.harness_config = {} mock_testsuite.harness_config = {}
instance = TestInstance(testsuite=mock_testsuite, platform=mock_platform, outdir="") outdir = tmp_path / 'gtest_out'
outdir.mkdir()
instance = TestInstance(testsuite=mock_testsuite, platform=mock_platform, outdir=outdir)
instance.build_dir = "build_dir" instance.build_dir = "build_dir"
open_mock = mock.mock_open() open_mock = mock.mock_open()
@ -183,7 +192,7 @@ TEST_DATA_3 = [('one_line', None), ('multi_line', 2),]
TEST_DATA_3, TEST_DATA_3,
ids=["one line", "multi line"] ids=["one line", "multi line"]
) )
def test_console_configure(type, num_patterns): def test_console_configure(tmp_path, type, num_patterns):
#Arrange #Arrange
mock_platform = mock.Mock() mock_platform = mock.Mock()
mock_platform.name = "mock_platform" mock_platform.name = "mock_platform"
@ -193,7 +202,10 @@ def test_console_configure(type, num_patterns):
mock_testsuite.name = "mock_testsuite" mock_testsuite.name = "mock_testsuite"
mock_testsuite.harness_config = {} mock_testsuite.harness_config = {}
instance = TestInstance(testsuite=mock_testsuite, platform=mock_platform, outdir="") outdir = tmp_path / 'gtest_out'
outdir.mkdir()
instance = TestInstance(testsuite=mock_testsuite, platform=mock_platform, outdir=outdir)
instance.testsuite.harness_config = { instance.testsuite.harness_config = {
'type': type, 'type': type,
'regex': ['pattern1', 'pattern2'] 'regex': ['pattern1', 'pattern2']
@ -223,7 +235,7 @@ TEST_DATA_4 = [("one_line", True, "passed", "line", False, False),
TEST_DATA_4, TEST_DATA_4,
ids=["one line", "multi line ordered", "multi line not ordered", "logger error", "fail on fault", "GCOV START", "GCOV END"] ids=["one line", "multi line ordered", "multi line not ordered", "logger error", "fail on fault", "GCOV START", "GCOV END"]
) )
def test_console_handle(line_type, ordered_val, exp_state, line, exp_fault, exp_capture): def test_console_handle(tmp_path, line_type, ordered_val, exp_state, line, exp_fault, exp_capture):
mock_platform = mock.Mock() mock_platform = mock.Mock()
mock_platform.name = "mock_platform" mock_platform.name = "mock_platform"
mock_platform.normalized_name = "mock_platform" mock_platform.normalized_name = "mock_platform"
@ -232,7 +244,10 @@ def test_console_handle(line_type, ordered_val, exp_state, line, exp_fault, exp_
mock_testsuite.name = "mock_testsuite" mock_testsuite.name = "mock_testsuite"
mock_testsuite.harness_config = {} mock_testsuite.harness_config = {}
instance = TestInstance(testsuite=mock_testsuite, platform=mock_platform, outdir="") outdir = tmp_path / 'gtest_out'
outdir.mkdir()
instance = TestInstance(testsuite=mock_testsuite, platform=mock_platform, outdir=outdir)
console = Console() console = Console()
console.instance = instance console.instance = instance
@ -278,7 +293,7 @@ TEST_DATA_5 = [("serial_pty", 0), (None, 0),(None, 1)]
ids=["hardware pty", "hardware", "non hardware"] ids=["hardware pty", "hardware", "non hardware"]
) )
def test_pytest__generate_parameters_for_hardware(pty_value, hardware_value): def test_pytest__generate_parameters_for_hardware(tmp_path, pty_value, hardware_value):
#Arrange #Arrange
mock_platform = mock.Mock() mock_platform = mock.Mock()
mock_platform.name = "mock_platform" mock_platform.name = "mock_platform"
@ -288,7 +303,10 @@ def test_pytest__generate_parameters_for_hardware(pty_value, hardware_value):
mock_testsuite.name = "mock_testsuite" mock_testsuite.name = "mock_testsuite"
mock_testsuite.harness_config = {} mock_testsuite.harness_config = {}
instance = TestInstance(testsuite=mock_testsuite, platform=mock_platform, outdir="") outdir = tmp_path / 'gtest_out'
outdir.mkdir()
instance = TestInstance(testsuite=mock_testsuite, platform=mock_platform, outdir=outdir)
handler = mock.Mock() handler = mock.Mock()
handler.instance = instance handler.instance = instance
@ -351,7 +369,7 @@ def test__update_command_with_env_dependencies():
assert result_cmd == ['cmd', '-p', 'twister_harness.plugin'] assert result_cmd == ['cmd', '-p', 'twister_harness.plugin']
def test_pytest_run(caplog): def test_pytest_run(tmp_path, caplog):
# Arrange # Arrange
timeout = 10 timeout = 10
cmd=['command'] cmd=['command']
@ -375,7 +393,11 @@ def test_pytest_run(caplog):
options = mock.Mock(verbose= 0), options = mock.Mock(verbose= 0),
type_str = 'handler_type' type_str = 'handler_type'
) )
instance = TestInstance(testsuite=mock_testsuite, platform=mock_platform, outdir="")
outdir = tmp_path / 'gtest_out'
outdir.mkdir()
instance = TestInstance(testsuite=mock_testsuite, platform=mock_platform, outdir=outdir)
instance.handler = handler instance.handler = handler
test_obj = Pytest() test_obj = Pytest()
@ -418,7 +440,7 @@ TEST_DATA_7 = [("", "Running TESTSUITE suite_name", ['suite_name'], None, True,
TEST_DATA_7, TEST_DATA_7,
ids=['testsuite', 'testcase', 'pass', 'skip', 'failed', 'ztest pass', 'ztest fail'] ids=['testsuite', 'testcase', 'pass', 'skip', 'failed', 'ztest pass', 'ztest fail']
) )
def test_test_handle(caplog, exp_out, line, exp_suite_name, exp_status, ztest, state): def test_test_handle(tmp_path, caplog, exp_out, line, exp_suite_name, exp_status, ztest, state):
# Arrange # Arrange
line = line line = line
mock_platform = mock.Mock() mock_platform = mock.Mock()
@ -429,7 +451,10 @@ def test_test_handle(caplog, exp_out, line, exp_suite_name, exp_status, ztest, s
mock_testsuite.name = "mock_testsuite" mock_testsuite.name = "mock_testsuite"
mock_testsuite.harness_config = {} mock_testsuite.harness_config = {}
instance = TestInstance(testsuite=mock_testsuite, platform=mock_platform, outdir="") outdir = tmp_path / 'gtest_out'
outdir.mkdir()
instance = TestInstance(testsuite=mock_testsuite, platform=mock_platform, outdir=outdir)
test_obj = Test() test_obj = Test()
test_obj.configure(instance) test_obj.configure(instance)