Skip to content

Commit 83db378

Browse files
LukaszMrugalafabiobaltieri
authored andcommitted
scripts: twister: Remove Handler atavisms
Removed following fields from relevant Handlers, as they were unused in code: * Handler's state * Handler's generator * BinaryHandler's call_west_flash * QEMUHandler's results * QEMUWinHandler's results Signed-off-by: Lukasz Mrugala <[email protected]>
1 parent 3f78ca9 commit 83db378

File tree

3 files changed

+7
-22
lines changed

3 files changed

+7
-22
lines changed

scripts/pylib/twister/twisterlib/handlers.py

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ def __init__(self, instance, type_str="build"):
7272
"""
7373
self.options = None
7474

75-
self.state = "waiting"
7675
self.run = False
7776
self.type_str = type_str
7877

@@ -86,7 +85,6 @@ def __init__(self, instance, type_str="build"):
8685
self.build_dir = instance.build_dir
8786
self.log = os.path.join(self.build_dir, "handler.log")
8887
self.returncode = 0
89-
self.generator = None
9088
self.generator_cmd = None
9189
self.suite_name_check = True
9290
self.ready = False
@@ -178,7 +176,6 @@ def __init__(self, instance, type_str):
178176
"""
179177
super().__init__(instance, type_str)
180178

181-
self.call_west_flash = False
182179
self.seed = None
183180
self.extra_test_args = None
184181
self.line = b""
@@ -241,8 +238,6 @@ def _create_command(self, robot_test):
241238
command = [self.generator_cmd, "run_renode_test"]
242239
elif self.call_make_run:
243240
command = [self.generator_cmd, "run"]
244-
elif self.call_west_flash:
245-
command = ["west", "flash", "--skip-rebuild", "-d", self.build_dir]
246241
else:
247242
command = [self.binary]
248243

@@ -856,7 +851,7 @@ def _thread_update_instance_info(handler, handler_time, out_state):
856851
handler.instance.reason = "Unknown"
857852

858853
@staticmethod
859-
def _thread(handler, timeout, outdir, logfile, fifo_fn, pid_fn, results,
854+
def _thread(handler, timeout, outdir, logfile, fifo_fn, pid_fn,
860855
harness, ignore_unexpected_eof=False):
861856
fifo_in, fifo_out = QEMUHandler._thread_get_fifo_names(fifo_fn)
862857

@@ -997,7 +992,6 @@ def _update_instance_info(self, harness_state, is_timeout):
997992
self.instance.add_missing_case_status("blocked")
998993

999994
def handle(self, harness):
1000-
self.results = {}
1001995
self.run = True
1002996

1003997
sysbuild_build_dir = self._get_sysbuild_build_dir()
@@ -1009,7 +1003,7 @@ def handle(self, harness):
10091003
self.thread = threading.Thread(name=self.name, target=QEMUHandler._thread,
10101004
args=(self, self.get_test_timeout(), self.build_dir,
10111005
self.log_fn, self.fifo_fn,
1012-
self.pid_fn, self.results, harness,
1006+
self.pid_fn, harness,
10131007
self.ignore_unexpected_eof))
10141008

10151009
self.thread.daemon = True
@@ -1088,7 +1082,6 @@ def __init__(self, instance, type_str):
10881082
self.pid = 0
10891083
self.thread = None
10901084
self.stop_thread = False
1091-
self.results = {}
10921085

10931086
if instance.testsuite.ignore_qemu_crash:
10941087
self.ignore_qemu_crash = True
@@ -1296,7 +1289,6 @@ def _monitor_output(self, queue, timeout, logfile, pid_fn, harness, ignore_unexp
12961289
self._stop_qemu_process(self.pid)
12971290

12981291
def handle(self, harness):
1299-
self.results = {}
13001292
self.run = True
13011293

13021294
sysbuild_build_dir = self._get_sysbuild_build_dir()

scripts/pylib/twister/twisterlib/testinstance.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,6 @@ def setup_handler(self, env):
201201
if handler:
202202
handler.options = options
203203
handler.generator_cmd = env.generator_cmd
204-
handler.generator = env.generator
205204
handler.suite_name_check = not options.disable_suite_name_check
206205
self.handler = handler
207206

scripts/tests/twister/test_handlers.py

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -442,28 +442,25 @@ def wait(self, *args, **kwargs):
442442

443443

444444
TESTDATA_4 = [
445-
(True, False, False, True, None, None,
445+
(True, False, True, None, None,
446446
['valgrind', '--error-exitcode=2', '--leak-check=full',
447447
f'--suppressions={ZEPHYR_BASE}/scripts/valgrind.supp',
448448
'--log-file=build_dir/valgrind.log', '--track-origins=yes',
449449
'generator', 'run_renode_test']),
450-
(False, True, False, False, 123, None, ['generator', 'run', '--seed=123']),
451-
(False, False, True, False, None, None,
452-
['west', 'flash', '--skip-rebuild', '-d', 'build_dir']),
453-
(False, False, False, False, None, ['ex1', 'ex2'], ['bin', 'ex1', 'ex2']),
450+
(False, True, False, 123, None, ['generator', 'run', '--seed=123']),
451+
(False, False, False, None, ['ex1', 'ex2'], ['bin', 'ex1', 'ex2']),
454452
]
455453

456454
@pytest.mark.parametrize(
457-
'robot_test, call_make_run, call_west_flash, enable_valgrind, seed,' \
455+
'robot_test, call_make_run, enable_valgrind, seed,' \
458456
' extra_args, expected',
459457
TESTDATA_4,
460-
ids=['robot, valgrind', 'make run, seed', 'west flash', 'binary, extra']
458+
ids=['robot, valgrind', 'make run, seed', 'binary, extra']
461459
)
462460
def test_binaryhandler_create_command(
463461
mocked_instance,
464462
robot_test,
465463
call_make_run,
466-
call_west_flash,
467464
enable_valgrind,
468465
seed,
469466
extra_args,
@@ -473,7 +470,6 @@ def test_binaryhandler_create_command(
473470
handler.generator_cmd = 'generator'
474471
handler.binary = 'bin'
475472
handler.call_make_run = call_make_run
476-
handler.call_west_flash = call_west_flash
477473
handler.options = mock.Mock(enable_valgrind=enable_valgrind)
478474
handler.seed = seed
479475
handler.extra_test_args = extra_args
@@ -1893,7 +1889,6 @@ def mock_cputime(pid):
18931889

18941890
type(mocked_instance.testsuite).timeout = mock.PropertyMock(return_value=timeout)
18951891
handler = QEMUHandler(mocked_instance, 'build')
1896-
handler.results = {}
18971892
handler.ignore_unexpected_eof = False
18981893
handler.pid_fn = 'pid_fn'
18991894
handler.fifo_fn = 'fifo_fn'
@@ -1953,7 +1948,6 @@ def mocked_open(filename, *args, **kwargs):
19531948
handler.log,
19541949
handler.fifo_fn,
19551950
handler.pid_fn,
1956-
handler.results,
19571951
harness,
19581952
handler.ignore_unexpected_eof
19591953
)

0 commit comments

Comments
 (0)