Updated timeout for more tests failing with TimeoutExpired

Signed-off-by: chandramerla <Chandra.Merla@ibm.com>

Author: chandramerla

tests/utils.py

@@ -286,7 +286,7 @@ def update_cluster_cpu_model(admin_client, hco_namespace, hco_resource, cpu_mode
             hco_namespace=hco_namespace,
             path=["cpuModel"],
             value=cpu_model,
-            timeout=60,
+            timeout=120,
         )
         yield
 

tests/virt/node/node_labeller/cpu_features/test_node_feature_discovery.py

@@ -56,7 +56,7 @@ def updated_kubevirt_cpus(
             hco_namespace=hco_namespace,
             path=[OBSOLETE_CPU, cluster_common_node_cpu],
             value=True,
-            timeout=60,
+            timeout=120,
         )
         wait_for_kv_stabilize(admin_client=admin_client, hco_namespace=hco_namespace)
         yield

utilities/storage.py

@@ -34,7 +34,6 @@
     CDI_LABEL,
     HOTPLUG_DISK_SERIAL,
     HPP_POOL,
-    OS_FLAVOR_WINDOWS,
     POD_CONTAINER_SPEC,
     TIMEOUT_1SEC,
     TIMEOUT_2MIN,
@@ -45,7 +44,6 @@
     TIMEOUT_10MIN,
     TIMEOUT_10SEC,
     TIMEOUT_20SEC,
-    TIMEOUT_30MIN,
     TIMEOUT_30SEC,
     TIMEOUT_60MIN,
     Images,
@@ -293,7 +291,7 @@ def data_volume(
                     # It will be in a status 'PendingPopulation' (for csi storage)
                     dv.wait_for_status(status="PendingPopulation", timeout=TIMEOUT_10SEC)
                 else:
-                    dv.wait_for_dv_success(timeout=TIMEOUT_60MIN if OS_FLAVOR_WINDOWS in image else TIMEOUT_30MIN)
+                    dv.wait_for_dv_success(timeout=TIMEOUT_60MIN)
         yield dv
 
 

utilities/virt.py

@@ -83,6 +83,7 @@
     TIMEOUT_12MIN,
     TIMEOUT_25MIN,
     TIMEOUT_30MIN,
+    TIMEOUT_60MIN,
     VIRT_HANDLER,
     VIRT_LAUNCHER,
     VIRTCTL,
@@ -1695,7 +1696,7 @@ def assert_vm_not_error_status(vm: VirtualMachineForTests, timeout: int = TIMEOU
 
 def wait_for_running_vm(
     vm: VirtualMachineForTests,
-    wait_until_running_timeout: int = TIMEOUT_4MIN,
+    wait_until_running_timeout: int = TIMEOUT_8MIN,
     wait_for_interfaces: bool = True,
     check_ssh_connectivity: bool = True,
     ssh_timeout: int = TIMEOUT_2MIN,
@@ -1733,7 +1734,7 @@ def running_vm(
     check_ssh_connectivity=True,
     ssh_timeout=TIMEOUT_2MIN,
     wait_for_cloud_init=False,
-    dv_wait_timeout=TIMEOUT_30MIN,
+    dv_wait_timeout=TIMEOUT_60MIN,
 ):
     """
     Wait for the VMI to be in Running state.
@@ -1814,7 +1815,7 @@ def wait_for_cloud_init_complete(vm, timeout=TIMEOUT_4MIN):
 def migrate_vm_and_verify(
     vm: VirtualMachineForTests | BaseVirtualMachine,
     client: DynamicClient | None = None,
-    timeout: int = TIMEOUT_12MIN,
+    timeout: int = TIMEOUT_25MIN,
     wait_for_interfaces: bool = True,
     check_ssh_connectivity: bool = False,
     wait_for_migration_success: bool = True,