Use local_cmd in place of os.system

Signed-off-by: Gaëtan Lehmann <gaetan.lehmann@vates.tech>

Author: glehmann

conftest.py

@@ -16,6 +16,7 @@
 
 import lib.config as global_config
 from lib import pxe
+from lib.commands import local_cmd
 from lib.common import (
     Defer,
     DiskDevName,
@@ -322,7 +323,7 @@ def setup_host(hostname_or_ip: str, *, config: pytest.Config | None = None) -> H
             assert len(ips) == 1
             host_vm.ip = ips[0]
 
-            wait_for(lambda: not os.system(f"nc -zw5 {host_vm.ip} 22"),
+            wait_for(lambda: local_cmd(["nc", "-zw5", str(host_vm.ip), "22"], check=False).returncode == 0,
                      "Wait for ssh up on nested host", retry_delay_secs=5)
 
             hostname_or_ip = host_vm.ip

scripts/install_xcpng.py

@@ -18,7 +18,7 @@
 # flake8: noqa: E402
 sys.path.append(f"{os.path.abspath(os.path.dirname(__file__))}/..")
 from lib import pxe
-from lib.commands import SSHCommandFailed, ssh
+from lib.commands import SSHCommandFailed, local_cmd, ssh
 from lib.common import is_uuid, wait_for
 from lib.host import Host, host_data
 from lib.pool import Pool
@@ -72,7 +72,7 @@ def generate_answerfile(directory: str, installer: str, hostname_or_ip: str, tar
             raise Exception(f"Unknown action: `{action}`")
 
 def is_ip_active(ip: str) -> bool:
-    return not os.system(f"ping -c 3 -W 10 {ip} > /dev/null 2>&1")
+    return local_cmd(["ping", "-c", "3", "-W", "10", ip], check=False).returncode == 0
 
 def is_ssh_up(ip: str) -> bool:
     try:

tests/network/test_vif_allowed_ip.py

@@ -3,14 +3,15 @@
 import ipaddress
 import os
 
+from lib.commands import local_cmd
 from lib.vm import VM
 
 # Requirements:
 # - one XCP-ng host (--hosts) >= 8.2 (>= 8.3 for the CIDR tests) with no SDN controller configured
 # - a VM (--vm)
 
 def ip_responsive(ip: str) -> bool:
-    return not os.system(f"ping -c 3 -W 10 {ip} > /dev/null 2>&1")
+    return local_cmd(["ping", "-c", "3", "-W", "10", ip], check=False).returncode == 0
 
 @pytest.mark.small_vm
 @pytest.mark.usefixtures("host_no_sdn_controller")