X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FN2VC.git;a=blobdiff_plain;f=n2vc%2Ftests%2Funit%2Ftest_k8s_helm3_conn.py;h=a2e75e1d5ce739294144edd8e15004a2df97e672;hp=33add05201eb56d64b142155b39ac8d4df277170;hb=HEAD;hpb=03241da419ceb2bb6892b749dee9a1444a80bb28 diff --git a/n2vc/tests/unit/test_k8s_helm3_conn.py b/n2vc/tests/unit/test_k8s_helm3_conn.py index 33add05..bddfddd 100644 --- a/n2vc/tests/unit/test_k8s_helm3_conn.py +++ b/n2vc/tests/unit/test_k8s_helm3_conn.py @@ -134,7 +134,6 @@ class TestK8sHelm3Conn(asynctest.TestCase): @asynctest.fail_on(active_handles=True) async def test_repo_list(self): - self.helm_conn._local_async_exec = asynctest.CoroutineMock(return_value=("", 0)) await self.helm_conn.repo_list(self.cluster_uuid) @@ -150,7 +149,6 @@ class TestK8sHelm3Conn(asynctest.TestCase): @asynctest.fail_on(active_handles=True) async def test_repo_remove(self): - self.helm_conn._local_async_exec = asynctest.CoroutineMock(return_value=("", 0)) repo_name = "bitnami" await self.helm_conn.repo_remove(self.cluster_uuid, repo_name) @@ -174,6 +172,7 @@ class TestK8sHelm3Conn(asynctest.TestCase): self.helm_conn._local_async_exec = asynctest.CoroutineMock(return_value=("", 0)) self.helm_conn._status_kdu = asynctest.CoroutineMock(return_value=None) self.helm_conn._store_status = asynctest.CoroutineMock() + self.helm_conn._repo_to_oci_url = Mock(return_value=None) self.kdu_instance = "stable-openldap-0005399828" self.helm_conn.generate_kdu_instance_name = Mock(return_value=self.kdu_instance) self.helm_conn._get_namespaces = asynctest.CoroutineMock(return_value=[]) @@ -268,6 +267,7 @@ class TestK8sHelm3Conn(asynctest.TestCase): } self.helm_conn._local_async_exec = asynctest.CoroutineMock(return_value=("", 0)) self.helm_conn._store_status = asynctest.CoroutineMock() + self.helm_conn._repo_to_oci_url = Mock(return_value=None) self.helm_conn.get_instance_info = asynctest.CoroutineMock( return_value=instance_info ) @@ -350,6 +350,7 @@ class TestK8sHelm3Conn(asynctest.TestCase): } self.helm_conn._local_async_exec = asynctest.CoroutineMock(return_value=("", 0)) self.helm_conn._store_status = asynctest.CoroutineMock() + self.helm_conn._repo_to_oci_url = Mock(return_value=None) self.helm_conn.get_instance_info = asynctest.CoroutineMock( return_value=instance_info ) @@ -418,6 +419,7 @@ class TestK8sHelm3Conn(asynctest.TestCase): self.helm_conn.values_kdu = asynctest.CoroutineMock(return_value=kdu_values) self.helm_conn._local_async_exec = asynctest.CoroutineMock(return_value=("", 0)) self.helm_conn._store_status = asynctest.CoroutineMock() + self.helm_conn._repo_to_oci_url = Mock(return_value=None) self.helm_conn.get_instance_info = asynctest.CoroutineMock( return_value=instance_info ) @@ -438,7 +440,7 @@ class TestK8sHelm3Conn(asynctest.TestCase): "--namespace testk8s --atomic --output yaml --set replicaCount=2 --timeout 1800s " "--reuse-values --version 1.2.3" ) - self.helm_conn._local_async_exec.assert_called_once_with( + self.helm_conn._local_async_exec.assert_called_with( command=command, env=self.env, raise_exception_on_error=False ) # TEST-2 @@ -800,7 +802,13 @@ class TestK8sHelm3Conn(asynctest.TestCase): ) self.helm_conn.repo_remove.assert_not_called() self.helm_conn.repo_add.assert_called_once_with( - self.cluster_uuid, "bitnami", "https://charts.bitnami.com/bitnami" + self.cluster_uuid, + "bitnami", + "https://charts.bitnami.com/bitnami", + cert=None, + user=None, + password=None, + oci=False, ) self.assertEqual(deleted_repo_list, [], "Deleted repo list should be empty") self.assertEqual(