scripts: twister: fixing compliance checks and minor issues

Fixing minor compliance errors and issues popping up after rebase.

Signed-off-by: Artur Dobrynin <[email protected]>

Author: ardo-nordic

scripts/pylib/twister/twisterlib/harness.py

@@ -1,5 +1,4 @@
 # SPDX-License-Identifier: Apache-2.0
-from __future__ import annotations
 
 import glob
 import json
@@ -13,12 +12,13 @@
 import sys
 import threading
 import time
-import xml.etree.ElementTree as ET
 import random
-from collections import OrderedDict
-from enum import Enum
 
 import junitparser.junitparser as junit
+import xml.etree.ElementTree as ET
+
+from collections import OrderedDict
+from enum import Enum
 from pytest import ExitCode
 from twisterlib.constants import SUPPORTED_SIMS_IN_PYTEST
 from twisterlib.environment import PYTEST_PLUGIN_INSTALLED, ZEPHYR_BASE

scripts/pylib/twister/twisterlib/runner.py

@@ -16,20 +16,31 @@
 import sys
 import time
 import traceback
+import elftools
+import yaml
+import expr_parser
+
 from math import log10
 from multiprocessing import Lock, Process, Value
 from multiprocessing.managers import BaseManager
 
-import elftools
-import yaml
 from colorama import Fore
+from packaging import version
+from anytree import Node, RenderTree
 from elftools.elf.elffile import ELFFile
 from elftools.elf.sections import SymbolTableSection
-from packaging import version
+
 from twisterlib.cmakecache import CMakeCache
-from twisterlib.environment import canonical_zephyr_base
+from twisterlib.environment import canonical_zephyr_base, TwisterEnv, ZEPHYR_BASE
 from twisterlib.error import BuildError, ConfigurationError, StatusAttributeError
 from twisterlib.statuses import TwisterStatus
+from twisterlib.coverage import run_coverage_instance
+from twisterlib.harness import Ctest, HarnessImporter, Pytest, Bsim
+from twisterlib.log_helper import log_command
+from twisterlib.platform import Platform
+from twisterlib.testinstance import TestInstance
+from twisterlib.testplan import change_skip_to_error_if_integration
+from twisterlib.testsuite import TestSuite
 
 if version.parse(elftools.__version__) < version.parse('0.24'):
     sys.exit("pyelftools is out of date, need version 0.24 or later")
@@ -38,27 +49,14 @@
 if sys.platform == 'linux':
     from twisterlib.jobserver import GNUMakeJobClient, GNUMakeJobServer, JobClient
 
-from twisterlib.environment import ZEPHYR_BASE
-
 sys.path.insert(0, os.path.join(ZEPHYR_BASE, "scripts/pylib/build_helpers"))
 from domains import Domains
-from twisterlib.coverage import run_coverage_instance
-from twisterlib.environment import TwisterEnv
-from twisterlib.harness import Ctest, HarnessImporter, Pytest, Bsim
-from twisterlib.log_helper import log_command
-from twisterlib.platform import Platform
-from twisterlib.testinstance import TestInstance
-from twisterlib.testplan import change_skip_to_error_if_integration
-from twisterlib.testsuite import TestSuite
 
 try:
     from yaml import CSafeLoader as SafeLoader
 except ImportError:
     from yaml import SafeLoader
 
-import expr_parser
-from anytree import Node, RenderTree
-
 logger = logging.getLogger('twister')
 logger.setLevel(logging.DEBUG)
 
@@ -1792,7 +1790,7 @@ def run(self):
                     harness.bsim_run(instance.handler.get_test_timeout())
                 else:
                     instance.status = TwisterStatus.ERROR
-                    instance.reason = str("BSIM not ready")
+                    instance.reason = "BSIM not ready"
                     logger.error(instance.reason)
             else:
                 instance.handler.handle(harness)

tests/bsim/bluetooth/host/att/read_fill_buf/testcase.yaml

@@ -14,7 +14,7 @@ tests:
       bsim_verbosity: 2
       bsim_sim_length: 60e6
       bsim_test_ids:
-        - the_test
-        - the_test
+        - cli
+        - srv
       bsim_options:
         - -RealEncryption=1

tests/bsim/bluetooth/host/gatt/ccc_store/test_scripts/ccc_store_no_long_wq.sh

@@ -24,7 +24,7 @@ tests:
         - '["-flash=ccc_store_client.log.bin", "-flash=ccc_store_server.log.bin"]'
         - -argstest
         - '10'
-  bluetooth.host.gatt.ccc_no_store_on_write:
+  bluetooth.host.gatt.ccc_store_no_store_on_write:
     harness_config:
       bsim_exe_name:
         - tests_bsim_bluetooth_host_gatt_ccc_store_overlay-no_store_on_write_conf
@@ -37,6 +37,12 @@ tests:
       EXTRA_CONF_FILE=overlay-no_store_on_write.conf
   bluetooth.host.gatt.ccc_store_no_long_wq:
     harness_config:
-      bsim_exe_name: tests_bsim_bluetooth_host_gatt_ccc_store_overlay-no_long_wq_conf
+      bsim_exe_name:
+        - tests_bsim_bluetooth_host_gatt_ccc_store_overlay-no_long_wq_conf
+      bsim_options:
+        - '["-flash=ccc_store_no_long_wq_client.log.bin",
+            "-flash=ccc_store_no_long_wq_server.log.bin"]'
+        - -argstest
+        - '10'
     extra_args:
       EXTRA_CONF_FILE=overlay-no_long_wq.conf

tests/bsim/bluetooth/host/gatt/ccc_store/testcase.yaml

@@ -15,21 +15,32 @@ common:
     bsim_options:
       - -RealEncryption=1
       - -flash_rm
-      - "['-flash=ccc_update_client.log.bin', '-flash=ccc_update_bad_client.log.bin',
-          '-flash=ccc_update_server.log.bin']"
 
 tests:
   bluetooth.host.security.ccc_update:
     harness_config:
       bsim_exe_name:
         - tests_bsim_bluetooth_host_security_ccc_update_prj_conf
+      bsim_options:
+        - "['-flash=ccc_update_client.log.bin', '-flash=ccc_update_bad_client.log.bin',
+            '-flash=ccc_update_server.log.bin']"
+  bluetooth.host.security.ccc_update_no_lazy_load:
     harness_config:
       bsim_exe_name:
         - tests_bsim_bluetooth_host_security_ccc_update_overlay-no_lazy_load_conf
+      bsim_options:
+        - "['-flash=ccc_update_no_lazy_load_client.log.bin',
+            '-flash=ccc_update_no_lazy_load_bad_client.log.bin',
+            '-flash=ccc_update_no_lazy_load_server.log.bin']"
     extra_args:
       EXTRA_CONF_FILE=overlay-no_lazy_load.conf
   bluetooth.host.security.ccc_update_no_long_wq:
     harness_config:
-      bsim_exe_name: tests_bsim_bluetooth_host_security_ccc_update_overlay-no_long_wq_conf
+      bsim_exe_name:
+        - tests_bsim_bluetooth_host_security_ccc_update_overlay-no_long_wq_conf
+      bsim_options:
+        - "['-flash=ccc_update_no_long_wq_client.log.bin',
+            '-flash=ccc_update_no_long_wq_bad_client.log.bin',
+            '-flash=ccc_update_no_long_wq_server.log.bin']"
     extra_args:
       EXTRA_CONF_FILE=overlay-no_long_wq.conf