util: remove fields with the same default values in infrastructure and utilities

tests/infrastructure/tekton/conftest.py

@@ -28,11 +28,9 @@
     OS_FLAVOR_FEDORA,
     TEKTON_AVAILABLE_PIPELINEREF,
     TEKTON_AVAILABLE_TASKS,
-    TIMEOUT_1MIN,
     TIMEOUT_2MIN,
     TIMEOUT_10MIN,
     TIMEOUT_30SEC,
-    TIMEOUT_50MIN,
     WINDOWS_EFI_INSTALLER_STR,
 )
 from utilities.data_utils import base64_encode_str
@@ -401,9 +399,7 @@ def pipelinerun_for_disk_uploader(
 
 @pytest.fixture()
 def final_status_pipelinerun(pipelinerun_from_pipeline_template):
-    return wait_for_final_status_pipelinerun(
-        pipelinerun=pipelinerun_from_pipeline_template, wait_timeout=TIMEOUT_50MIN, sleep_interval=TIMEOUT_1MIN
-    )
+    return wait_for_final_status_pipelinerun(pipelinerun=pipelinerun_from_pipeline_template)
 
 
 @pytest.fixture()

utilities/bitwarden.py

@@ -59,7 +59,6 @@ def _run_bws_cli(access_token: str, args: list[str]) -> str:
     # so success must be checked explicitly below.
     success, stdout, stderr = run_command(
         command=["bws", "--access-token", access_token, *args],
-        capture_output=True,
         hide_log_command=True,
     )
 

utilities/cluster.py

@@ -44,7 +44,6 @@ def get_oc_whoami_username(*, wait_timeout: int = 30, sleep: int = 3):
     def _whoami() -> str:
         did_succeed, stdout, _ = run_command(
             command=["oc", "whoami"],
-            capture_output=True,
             check=False,
             timeout=sleep,
         )

utilities/network.py

@@ -963,7 +963,7 @@ def enable_hyperconverged_ovs_annotations(
         wait_for_reconcile_post_update=True,
         admin_client=admin_client,
     ):
-        wait_for_ovs_status(network_addons_config=network_addons_config, status=True)
+        wait_for_ovs_status(network_addons_config=network_addons_config)
         ovs_daemonset = wait_for_ovs_daemonset_resource(admin_client=admin_client, hco_namespace=hco_namespace)
         ovs_daemonset.wait_until_deployed()
         yield ovs_daemonset

utilities/oadp.py

@@ -183,7 +183,7 @@ def create_rhel_vm(
             run_strategy=VirtualMachine.RunStrategy.ALWAYS,
         ) as vm:
             if wait_running:
-                running_vm(vm=vm, wait_for_interfaces=True)
+                running_vm(vm=vm)
             yield vm
     finally:
         cleanup_artifactory_secret_and_config_map(

utilities/unittests/test_bitwarden.py

@@ -59,7 +59,6 @@ def test_get_all_cnv_tests_secrets(self, mock_run_command):
             assert mock_run_command.call_count == 1
             call_args = mock_run_command.call_args
             assert call_args.kwargs["command"] == ["bws", "--access-token", "test-token", "secret", "list"]
-            assert call_args.kwargs["capture_output"] is True
 
     @patch("bitwarden.run_command")
     def test_get_all_cnv_tests_secrets_command_error(self, mock_run_command):

utilities/unittests/test_cluster.py

@@ -160,7 +160,6 @@ def call_func_once(*args, **kwargs):
         assert result == "system:admin"
         mock_run_command.assert_called_once_with(
             command=["oc", "whoami"],
-            capture_output=True,
             check=False,
             timeout=3,
         )

utilities/unittests/test_oadp.py

@@ -335,7 +335,7 @@ def test_create_rhel_vm_success_with_wait(
         mock_get_config_map.assert_called_once_with(namespace="test-namespace")
         mock_get_url.assert_called_once()
         mock_dv.to_dict.assert_called_once()
-        mock_running_vm.assert_called_once_with(vm=mock_vm, wait_for_interfaces=True)
+        mock_running_vm.assert_called_once_with(vm=mock_vm)
         mock_cleanup.assert_called_once_with(artifactory_secret=mock_secret, artifactory_config_map=mock_config_map)
 
     @patch("utilities.oadp.cleanup_artifactory_secret_and_config_map")

utilities/virt.py

@@ -2624,7 +2624,7 @@ def pause_unpause_vm_and_check_connectivity(vm: VirtualMachineForTests) -> None:
     vm.vmi.pause(wait=True)
     vm.vmi.unpause(wait=True)
     LOGGER.info("Verify VM is running and ready after unpause")
-    wait_for_ssh_connectivity(vm=vm, timeout=TIMEOUT_2MIN)
+    wait_for_ssh_connectivity(vm=vm)
 
 
 def validate_pause_unpause_linux_vm(vm: VirtualMachineForTests, pre_pause_pid: int | None = None) -> None: