fix failing test cases

Author: amitkrprajapati

tests/unitary/with_extras/operator/feature-store/test_local_marketplace.py

@@ -3,7 +3,7 @@
 
 import mock
 import yaml
-from kubernetes.client import V1PodList, V1Pod, V1PodStatus, V1PodCondition
+from kubernetes.client import V1PodCondition
 
 from ads.opctl.backend.marketplace.local_marketplace import LocalMarketplaceOperatorBackend
 from ads.opctl.backend.marketplace.models.marketplace_type import HelmMarketplaceListingDetails
@@ -28,34 +28,6 @@ def test_helm_values_to_yaml(file_writer: Mock):
  file_writer.return_value.__enter__().write.assert_called_once_with(yaml.dump(sample_helm_value))
 
 
-@patch('ads.opctl.backend.marketplace.local_marketplace.time')
-@patch('ads.opctl.backend.marketplace.local_marketplace.client.CoreV1Api')
-@patch('ads.opctl.backend.marketplace.local_marketplace.config.load_kube_config')
-def test_wait_for_pod_healthy(kube_config: Mock, kube_client: Mock, timer: Mock):
- local_marketplace_operator = LocalMarketplaceOperatorBackend(config={'execution': {}})
- timer.time = Mock(side_effect=[0.0, 11 * 60])
- kube_client.return_value.list_namespaced_pod.return_value.items.__getitem__.return_value.status.conditions.__iter__ = Mock(
- return_value=iter([V1PodCondition(type="Ready", status="True")]))
-
- assert local_marketplace_operator._wait_for_pod_ready('namespace', 'pod_name') == 0
- kube_client.return_value.list_namespaced_pod.assert_called_once_with(namespace='namespace',
- label_selector='app.kubernetes.io/instance=pod_name')
- kube_config.assert_called()
-
-
-@patch('ads.opctl.backend.marketplace.local_marketplace.time')
-@patch('ads.opctl.backend.marketplace.local_marketplace.client.CoreV1Api')
-@patch('ads.opctl.backend.marketplace.local_marketplace.config.load_kube_config')
-def test_wait_for_pod_unhealthy(kube_config: Mock, kube_client: Mock, timer: Mock):
- local_marketplace_operator = LocalMarketplaceOperatorBackend(config={'execution': {}})
- timer.time = Mock(return_value=0.0)
- kube_client.return_value.list_namespaced_pod.return_value.items.__getitem__.return_value.status.conditions.__iter__ = Mock(
- return_value=iter([V1PodCondition(type="Ready", status="False")]))
-
- assert local_marketplace_operator._wait_for_pod_ready('namespace', 'pod_name') == -1
- kube_client.return_value.list_namespaced_pod.assert_called()
- kube_config.assert_called()
-
 
 @patch('ads.opctl.backend.marketplace.local_marketplace.export_helm_chart')
 @patch('ads.opctl.backend.marketplace.local_marketplace.list_container_images')
@@ -73,19 +45,19 @@ def test_export_helm_chart_to_container_registry(list_api: Mock, export_api: Moc
  assert result[pattern] == f"{pattern}-1"
 
 
+@patch('ads.opctl.backend.marketplace.local_marketplace.wait_for_pod_ready')
 @patch('ads.opctl.backend.marketplace.local_marketplace.check_helm_login')
 @patch('ads.opctl.backend.marketplace.local_marketplace.check_prerequisites')
 @patch('ads.opctl.backend.marketplace.local_marketplace.run_helm_install')
 @patch('ads.opctl.backend.marketplace.local_marketplace.MarketplaceBackendRunner')
 @patch('ads.opctl.backend.marketplace.local_marketplace.operator_runtime')
 def test_run_with_python_success(operator_runtime: Mock, backend_runner: Mock, helm_install_api: Mock,
- check_prerequisites: Mock, check_helm_login: Mock
+ check_prerequisites: Mock, check_helm_login: Mock, wait_for_pod_api:Mock
  ):
  local_marketplace_operator = LocalMarketplaceOperatorBackend(config={'execution': {}}, operator_info=OperatorInfo())
  local_marketplace_operator._export_helm_chart_to_container_registry_ = Mock()
  local_marketplace_operator._save_helm_values_to_yaml_ = Mock()
- local_marketplace_operator.run_bugfix_command = Mock()
- local_marketplace_operator._wait_for_pod_ready = Mock(return_value=0)
+ wait_for_pod_api.return_value = 0
  mock_helm_detail = Mock(spec=HelmMarketplaceListingDetails)
  mock_helm_detail.helm_values = {}
  mock_helm_detail.helm_app_name = 'helm_app_name'

tests/unitary/with_extras/operator/feature-store/test_marketplace_utils.py

@@ -1,8 +1,10 @@
 import os
 from unittest.mock import Mock, patch
 
+from kubernetes.client import V1PodCondition
+
 from ads.opctl.backend.marketplace.marketplace_utils import set_kubernetes_session_token_env, get_docker_bearer_token, \
- export_helm_chart, list_container_images
+ export_helm_chart, list_container_images, wait_for_pod_ready
 
 
 def test_set_kubernetes_session_token_env():
@@ -38,3 +40,30 @@ def test_list_container_image(oci_factory: Mock):
  listing_details = Mock()
  list_container_images(listing_details)
  oci_factory.return_value.artifacts.list_container_images.assert_called_once()
+
+@patch('ads.opctl.backend.marketplace.marketplace_utils.time')
+@patch('kubernetes.client.CoreV1Api')
+@patch('kubernetes.config.load_kube_config')
+def test_wait_for_pod_unhealthy(kube_config: Mock, kube_client: Mock, timer: Mock):
+ timer.time = Mock(return_value=0.0)
+ kube_client.return_value.list_namespaced_pod.return_value.items.__getitem__.return_value.status.conditions.__iter__ = Mock(
+ return_value=iter([V1PodCondition(type="Ready", status="False")]))
+
+ assert wait_for_pod_ready('namespace', 'pod_name') == -1
+ kube_client.return_value.list_namespaced_pod.assert_called()
+ kube_config.assert_called()
+
+@patch('ads.opctl.backend.marketplace.marketplace_utils.time')
+@patch('kubernetes.client.CoreV1Api')
+@patch('kubernetes.config.load_kube_config')
+def test_wait_for_pod_healthy(kube_config: Mock, kube_client: Mock, timer: Mock):
+ timer.time = Mock(side_effect=[0.0, 11 * 60])
+ kube_client.return_value.list_namespaced_pod.return_value.items.__getitem__.return_value.status.conditions.__iter__ = Mock(
+ return_value=iter([V1PodCondition(type="Ready", status="True")]))
+
+ assert wait_for_pod_ready('namespace', 'pod_name') == 0
+ kube_client.return_value.list_namespaced_pod.assert_called_once_with(namespace='namespace',
+ label_selector='app.kubernetes.io/instance=pod_name')
+ kube_config.assert_called()
+
+

tests/unitary/with_extras/operator/feature-store/test_prerequisite_checker.py

@@ -1,12 +1,13 @@
 from subprocess import CompletedProcess
 from unittest.mock import patch, Mock, call
 
+import pytest
 from oci.marketplace.models import AcceptedAgreementSummary, AgreementSummary
 
 from ads.opctl.backend.marketplace.models.marketplace_type import HelmMarketplaceListingDetails, \
  MarketplaceListingDetails
 from ads.opctl.backend.marketplace.prerequisite_checker import check_prerequisites, _prompt_kubernetes_confirmation_, \
- _check_binaries_, _check_license_for_listing_
+ _check_binaries_, _check_license_for_listing_, BinaryValidation
 
 
 @patch(
@@ -32,7 +33,7 @@ def test_prompt_kubernetes_confirmation(click: Mock):
 
 @patch("ads.opctl.backend.marketplace.prerequisite_checker.subprocess.run")
 def test_check_binaries_success(subprocess_runner: Mock):
- binaries = ["bin_a", "bin_b"]
+ binaries = [BinaryValidation("bin_a", ""), BinaryValidation("bin_b", "")]
  subprocess_runner.return_value = CompletedProcess(args="", returncode=0)
  _check_binaries_(binaries)
  subprocess_runner.assert_has_calls([
@@ -43,13 +44,14 @@ def test_check_binaries_success(subprocess_runner: Mock):
 
 @patch("ads.opctl.backend.marketplace.prerequisite_checker.subprocess.run")
 def test_check_binaries_failure(subprocess_runner: Mock):
- binaries = ["bin_a", "bin_b"]
- subprocess_runner.return_value = CompletedProcess(args="", returncode=-1)
- _check_binaries_(binaries)
- subprocess_runner.assert_has_calls([
- call(['which', 'bin_a'], capture_output=True),
- call(['which', 'bin_b'], capture_output=True)
- ])
+ with pytest.raises(Exception):
+ binaries = [BinaryValidation("bin_a", ""), BinaryValidation("bin_b", "")]
+ subprocess_runner.return_value = CompletedProcess(args="", returncode=-1)
+ _check_binaries_(binaries)
+ subprocess_runner.assert_has_calls([
+ call(['which', 'bin_a'], capture_output=True),
+ call(['which', 'bin_b'], capture_output=True)
+ ])
 
 
 @patch("ads.opctl.backend.marketplace.prerequisite_checker.get_marketplace_client")