tests: bsim: host: minor updates related to twister

ardo-nordic · ardo-nordic · commit ae6cc818b282 · 2025-02-14T10:58:16.000+01:00
Increasing test timeouts for better margins. Removing missed obsolete
shell running files.

Signed-off-by: Artur Dobrynin &lt;artur.dobrynin@nordicsemi.no&gt;
diff --git a/scripts/pylib/twister/twisterlib/harness.py b/scripts/pylib/twister/twisterlib/harness.py
@@ -992,12 +992,15 @@ def configure(self, instance):
             [os.path.join(self._bsim_out_path, exe_name) for exe_name in exe_names]
 
     def clean_exes(self):
-        for exe_path in [self._get_exe_path(i) for i in range(len(self._exe_paths))]:
-            if os.path.exists(exe_path):
-                os.remove(exe_path)
-
         self._set_start_time()
 
+        try:
+            for exe_path in [self._get_exe_path(i) for i in range(len(self._exe_paths))]:
+                if os.path.exists(exe_path):
+                    os.remove(exe_path)
+        except Exception as e:
+            logger.warning(f'Failed to clean up bsim exes: {e}')
+
     def wait_bsim_ready(self):
         start_time = time.time()
         while time.time() - start_time < Bsim.BSIM_READY_TIMEOUT_S:
diff --git a/tests/bsim/bluetooth/host/adv/encrypted/css_sample_data/testcase.yaml b/tests/bsim/bluetooth/host/adv/encrypted/css_sample_data/testcase.yaml
@@ -4,7 +4,7 @@ common:
   platform_allow:
     - nrf52_bsim/native
   harness: bsim
-  timeout: 2
+  timeout: 5
   harness_config:
       bsim_exe_name:
         - tests_bsim_bluetooth_host_adv_encrypted_css_sample_data_prj_conf
diff --git a/tests/bsim/bluetooth/host/adv/encrypted/ead_sample/testcase.yaml b/tests/bsim/bluetooth/host/adv/encrypted/ead_sample/testcase.yaml
@@ -5,7 +5,7 @@ tests:
     platform_allow:
       - nrf52_bsim/native
     harness: bsim
-    timeout: 2
+    timeout: 5
     harness_config:
       bsim_exe_name:
         - tests_bsim_bluetooth_host_adv_encrypted_ead_sample_prj_conf
diff --git a/tests/bsim/bluetooth/host/att/eatt_notif/testcase.yaml b/tests/bsim/bluetooth/host/att/eatt_notif/testcase.yaml
@@ -6,7 +6,7 @@ tests:
       - nrf52_bsim/native
       - nrf5340bsim/nrf5340/cpunet
     harness: bsim
-    timeout: 2
+    timeout: 5
     harness_config:
       bsim_exe_name:
         - tests_bsim_bluetooth_host_att_eatt_notif_prj_conf
diff --git a/tests/bsim/bluetooth/host/att/long_read/testcase.yaml b/tests/bsim/bluetooth/host/att/long_read/testcase.yaml
@@ -5,7 +5,7 @@ tests:
     platform_allow:
       - nrf52_bsim/native
     harness: bsim
-    timeout: 2
+    timeout: 10
     harness_config:
       bsim_exe_name:
         - tests_bsim_bluetooth_host_att_long_read_prj_conf
diff --git a/tests/bsim/bluetooth/host/att/mtu_update/testcase.yaml b/tests/bsim/bluetooth/host/att/mtu_update/testcase.yaml
@@ -4,7 +4,7 @@ common:
   platform_allow:
     - nrf52_bsim/native
   harness: bsim
-  timeout: 2
+  timeout: 5
 
 tests:
   bluetooth.host.att.mtu_update.build_central:
diff --git a/tests/bsim/bluetooth/host/att/open_close/testcase.yaml b/tests/bsim/bluetooth/host/att/open_close/testcase.yaml
@@ -4,7 +4,7 @@ tests:
       - bluetooth
     platform_allow:
       - nrf52_bsim/native
-    timeout: 10
+    timeout: 20
     harness: bsim
     harness_config:
       bsim_exe_name:
diff --git a/tests/bsim/bluetooth/host/att/pipeline/testcase.yaml b/tests/bsim/bluetooth/host/att/pipeline/testcase.yaml
@@ -4,7 +4,7 @@ common:
     - bluetooth
   platform_allow:
     - nrf52_bsim/native
-  timeout: 5
+  timeout: 20
   harness: bsim
   harness_config:
     bsim_verbosity: 2
diff --git a/tests/bsim/bluetooth/host/att/read_fill_buf/testcase.yaml b/tests/bsim/bluetooth/host/att/read_fill_buf/testcase.yaml
@@ -5,7 +5,7 @@ tests:
       - bluetooth
     platform_allow:
       - nrf52_bsim/native
-    timeout: 2
+    timeout: 5
     harness: bsim
     harness_config:
       bsim_exe_name:
diff --git a/tests/bsim/bluetooth/host/att/retry_on_sec_err/testcase.yaml b/tests/bsim/bluetooth/host/att/retry_on_sec_err/testcase.yaml
@@ -5,7 +5,7 @@ common:
   platform_allow:
     - nrf52_bsim/native
   harness: bsim
-  timeout: 2
+  timeout: 5
   harness_config:
     bsim_verbosity: 2
     bsim_sim_length: 60e6
diff --git a/tests/bsim/bluetooth/host/att/timeout/testcase.yaml b/tests/bsim/bluetooth/host/att/timeout/testcase.yaml
@@ -4,7 +4,7 @@ tests:
       - bluetooth
     platform_allow:
       - nrf52_bsim/native
-    timeout: 10
+    timeout: 20
     harness: bsim
     harness_config:
       bsim_exe_name:
diff --git a/tests/bsim/bluetooth/host/central/testcase.yaml b/tests/bsim/bluetooth/host/central/testcase.yaml
@@ -6,7 +6,7 @@ common:
     - nrf52_bsim/native
     - nrf5340bsim/nrf5340/cpunet
   harness: bsim
-  timeout: 2
+  timeout: 5
   harness_config:
     bsim_verbosity: 2
     bsim_sim_length: 60e6
diff --git a/tests/bsim/bluetooth/host/gatt/authorization/testcase.yaml b/tests/bsim/bluetooth/host/gatt/authorization/testcase.yaml
@@ -5,7 +5,7 @@ tests:
     platform_allow:
       - nrf52_bsim/native
       - nrf5340bsim/nrf5340/cpunet
-    timeout: 2
+    timeout: 5
     harness: bsim
     harness_config:
       bsim_exe_name:
diff --git a/tests/bsim/bluetooth/host/gatt/caching/test_scripts/_run_test.sh b/tests/bsim/bluetooth/host/gatt/caching/test_scripts/_run_test.sh
diff --git a/tests/bsim/bluetooth/host/gatt/caching/testcase.yaml b/tests/bsim/bluetooth/host/gatt/caching/testcase.yaml
@@ -5,7 +5,7 @@ common:
     - nrf52_bsim/native
     - nrf5340bsim/nrf5340/cpunet
   no_build: true
-  timeout: 5
+  timeout: 10
   harness: bsim
   harness_config:
     bsim_verbosity: 2
diff --git a/tests/bsim/bluetooth/host/gatt/device_name/test_scripts/run_device_name.sh b/tests/bsim/bluetooth/host/gatt/device_name/test_scripts/run_device_name.sh
diff --git a/tests/bsim/bluetooth/host/gatt/device_name/testcase.yaml b/tests/bsim/bluetooth/host/gatt/device_name/testcase.yaml
@@ -1,10 +1,17 @@
 tests:
   bluetooth.host.gatt.device_name:
-    build_only: true
     tags:
       - bluetooth
     platform_allow:
       - nrf52_bsim/native
     harness: bsim
     harness_config:
-      bsim_exe_name: tests_bsim_bluetooth_host_gatt_device_name_prj_conf
+      bsim_exe_name:
+        - tests_bsim_bluetooth_host_gatt_device_name_prj_conf
+      bsim_verbosity: 2
+      bsim_sim_length: 2e6
+      bsim_test_ids:
+        - server
+        - client
+      bsim_options:
+        - -RealEncryption=1
diff --git a/tests/bsim/bluetooth/host/gatt/general/testcase.yaml b/tests/bsim/bluetooth/host/gatt/general/testcase.yaml
@@ -6,7 +6,7 @@ tests:
       - nrf52_bsim/native
       - nrf5340bsim/nrf5340/cpunet
     harness: bsim
-    timeout: 2
+    timeout: 5
     harness_config:
       bsim_exe_name:
         - tests_bsim_bluetooth_host_gatt_general_prj_conf
diff --git a/tests/bsim/bluetooth/host/gatt/notify/test_scripts/_run_test.sh b/tests/bsim/bluetooth/host/gatt/notify/test_scripts/_run_test.sh
diff --git a/tests/bsim/bluetooth/host/gatt/notify/testcase.yaml b/tests/bsim/bluetooth/host/gatt/notify/testcase.yaml
@@ -4,7 +4,7 @@ common:
   platform_allow:
     - nrf52_bsim/native
   harness: bsim
-  timeout: 2
+  timeout: 10
   no_build: true
   harness_config:
     bsim_exe_name:
diff --git a/tests/bsim/bluetooth/host/gatt/notify_multiple/testcase.yaml b/tests/bsim/bluetooth/host/gatt/notify_multiple/testcase.yaml
@@ -4,7 +4,7 @@ tests:
       - bluetooth
     platform_allow:
       - nrf52_bsim/native
-    timeout: 2
+    timeout: 5
     harness: bsim
     harness_config:
       bsim_exe_name:
diff --git a/tests/bsim/bluetooth/host/gatt/sc_indicate/testcase.yaml b/tests/bsim/bluetooth/host/gatt/sc_indicate/testcase.yaml
@@ -4,7 +4,7 @@ tests:
       - bluetooth
     platform_allow:
       - nrf52_bsim/native
-    timeout: 2
+    timeout: 10
     harness: bsim
     harness_config:
       bsim_exe_name:
diff --git a/tests/bsim/bluetooth/host/gatt/settings_clear/testcase.yaml b/tests/bsim/bluetooth/host/gatt/settings_clear/testcase.yaml
@@ -5,12 +5,12 @@ tests:
     platform_allow:
       - nrf52_bsim/native
     harness: bsim
-    timeout: 2
+    timeout: 5
     harness_config:
       bsim_exe_name:
         - tests_bsim_bluetooth_host_gatt_settings_clear_prj_conf
       bsim_verbosity: 2
-      bsim_sim_length: 2e6
+      bsim_sim_length: 10e6
       bsim_test_ids:
         - client
         - server
diff --git a/tests/bsim/bluetooth/host/iso/bis/testcase.yaml b/tests/bsim/bluetooth/host/iso/bis/testcase.yaml
@@ -4,7 +4,7 @@ common:
   platform_allow:
     - nrf52_bsim/native
   harness: bsim
-  timeout: 2
+  timeout: 5
   harness_config:
     bsim_verbosity: 2
     bsim_sim_length: 30e6
diff --git a/tests/bsim/bluetooth/host/iso/cis/testcase.yaml b/tests/bsim/bluetooth/host/iso/cis/testcase.yaml
@@ -4,7 +4,7 @@ common:
   platform_allow:
     - nrf52_bsim/native
   harness: bsim
-  timeout: 2
+  timeout: 5
   harness_config:
     bsim_exe_name:
       - tests_bsim_bluetooth_host_iso_cis_prj_conf
diff --git a/tests/bsim/bluetooth/host/iso/frag/testcase.yaml b/tests/bsim/bluetooth/host/iso/frag/testcase.yaml
@@ -4,7 +4,7 @@ tests:
       - bluetooth
     platform_allow:
       - nrf52_bsim/native
-    timeout: 2
+    timeout: 5
     harness: bsim
     harness_config:
       bsim_exe_name:
diff --git a/tests/bsim/bluetooth/host/iso/frag_2/testcase.yaml b/tests/bsim/bluetooth/host/iso/frag_2/testcase.yaml
@@ -4,7 +4,7 @@ tests:
       - bluetooth
     platform_allow:
       - nrf52_bsim/native
-    timeout: 2
+    timeout: 5
     harness: bsim
     harness_config:
       bsim_exe_name:
diff --git a/tests/bsim/bluetooth/host/l2cap/credits/testcase.yaml b/tests/bsim/bluetooth/host/l2cap/credits/testcase.yaml
@@ -4,7 +4,7 @@ common:
   platform_allow:
     - nrf52_bsim/native
   harness: bsim
-  timeout: 2
+  timeout: 5
   harness_config:
     bsim_verbosity: 2
     bsim_sim_length: 30e6
diff --git a/tests/bsim/bluetooth/host/l2cap/credits_seg_recv/testcase.yaml b/tests/bsim/bluetooth/host/l2cap/credits_seg_recv/testcase.yaml
@@ -4,7 +4,7 @@ common:
   platform_allow:
     - nrf52_bsim/native
   harness: bsim
-  timeout: 2
+  timeout: 5
   harness_config:
     bsim_verbosity: 2
     bsim_sim_length: 30e6
diff --git a/tests/bsim/bluetooth/host/l2cap/many_conns/testcase.yaml b/tests/bsim/bluetooth/host/l2cap/many_conns/testcase.yaml
@@ -4,7 +4,7 @@ tests:
       - bluetooth
     platform_allow:
       - nrf52_bsim/native
-    timeout: 2
+    timeout: 5
     harness: bsim
     harness_config:
       bsim_exe_name:
diff --git a/tests/bsim/bluetooth/host/l2cap/multilink_peripheral/testcase.yaml b/tests/bsim/bluetooth/host/l2cap/multilink_peripheral/testcase.yaml
@@ -4,7 +4,7 @@ tests:
       - bluetooth
     platform_allow:
       - nrf52_bsim/native
-    timeout: 3
+    timeout: 60
     harness: bsim
     harness_config:
       bsim_exe_name:
diff --git a/tests/bsim/bluetooth/host/l2cap/send_on_connect/testcase.yaml b/tests/bsim/bluetooth/host/l2cap/send_on_connect/testcase.yaml
@@ -4,7 +4,7 @@ common:
   platform_allow:
     - nrf52_bsim/native
     - nrf5340bsim/nrf5340/cpunet
-  timeout: 2
+  timeout: 5
   harness: bsim
   harness_config:
     bsim_verbosity: 2
diff --git a/tests/bsim/bluetooth/host/l2cap/split/testcase.yaml b/tests/bsim/bluetooth/host/l2cap/split/testcase.yaml
@@ -5,7 +5,7 @@ tests:
       - bluetooth
     platform_allow:
       - nrf52_bsim/native
-    timeout: 2
+    timeout: 5
     harness: bsim
     harness_config:
       bsim_exe_name:
diff --git a/tests/bsim/bluetooth/host/l2cap/stress/testcase.yaml b/tests/bsim/bluetooth/host/l2cap/stress/testcase.yaml
@@ -3,7 +3,7 @@ common:
     - bluetooth
   platform_allow:
     - nrf52_bsim/native
-  timeout: 60
+  timeout: 120
   harness: bsim
   harness_config:
     bsim_verbosity: 2
diff --git a/tests/bsim/bluetooth/host/misc/acl_tx_frag/testcase.yaml b/tests/bsim/bluetooth/host/misc/acl_tx_frag/testcase.yaml
@@ -4,7 +4,7 @@ tests:
       - bluetooth
     platform_allow:
       - nrf52_bsim/native
-    timeout: 5
+    timeout: 20
     harness: bsim
     harness_config:
       bsim_exe_name:
diff --git a/tests/bsim/bluetooth/host/misc/unregister_conn_cb/testcase.yaml b/tests/bsim/bluetooth/host/misc/unregister_conn_cb/testcase.yaml
@@ -5,7 +5,7 @@ tests:
     platform_allow:
       - nrf52_bsim/native
       - nrf5340bsim/nrf5340/cpunet
-    timeout: 2
+    timeout: 5
     harness: bsim
     harness_config:
       bsim_exe_name:
diff --git a/tests/bsim/bluetooth/host/privacy/device/testcase.yaml b/tests/bsim/bluetooth/host/privacy/device/testcase.yaml
diff --git a/tests/bsim/bluetooth/host/scan/slow/testcase.yaml b/tests/bsim/bluetooth/host/scan/slow/testcase.yaml
diff --git a/tests/bsim/bluetooth/host/security/id_addr_update/testcase.yaml b/tests/bsim/bluetooth/host/security/id_addr_update/testcase.yaml
diff --git a/tests/bsim/bluetooth/host/security/security_changed_callback/testcase.yaml b/tests/bsim/bluetooth/host/security/security_changed_callback/testcase.yaml
