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

scripts/pylib/twister/twisterlib/runner.py

@@ -41,6 +41,7 @@
 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
@@ -1792,7 +1793,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