Skip to content

Commit 6c8005b

Browse files
committed
Test unit test
1 parent f8561d5 commit 6c8005b

File tree

2 files changed

+54
-2
lines changed

2 files changed

+54
-2
lines changed

src/xpk/commands/cluster.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@
8181
from ..utils.templates import get_templates_absolute_path
8282
import shutil
8383
import os
84+
import time
8485

8586
CLUSTER_PREHEAT_JINJA_FILE = 'cluster_preheat.yaml.j2'
8687

@@ -1481,6 +1482,7 @@ def install_diagon_prerequisites():
14811482
cert_webhook_namespace_name = 'cert-manager'
14821483
# is_running = wait_for_cluster_running(args)
14831484
is_running = wait_for_deployment_ready(deployment_name, namespace_name)
1485+
time.sleep(30)
14841486
if is_running:
14851487
return_code = install_cert_manager()
14861488
if return_code != 0:
@@ -1489,6 +1491,7 @@ def install_diagon_prerequisites():
14891491
cert_webhook_ready = wait_for_deployment_ready(
14901492
cert_webhook_deployment_name, cert_webhook_namespace_name
14911493
)
1494+
time.sleep(30)
14921495
if cert_webhook_ready:
14931496

14941497
webhook_package = 'mldiagnostics-injection-webhook'

src/xpk/commands/cluster_test.py

Lines changed: 51 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,9 @@ def mocks(mocker) -> _Mocks:
5656
run_command_with_updates_path=(
5757
'xpk.commands.cluster.run_command_with_updates'
5858
),
59+
run_command_for_value_path=(
60+
'xpk.commands.cluster.run_command_for_value'
61+
),
5962
),
6063
)
6164

@@ -250,10 +253,56 @@ def test_run_gke_cluster_create_command_with_gke_version_has_no_autoupgrade_flag
250253
)
251254

252255

253-
def test_cluster_create_args_for_install_diagon_prerequisites(
256+
def test_install_diagon_prerequisites_commands_executed(
254257
mocks: _Mocks,
258+
mocker,
255259
):
260+
mock_sleep = mocker.patch('time.sleep', return_value=None)
261+
262+
mock_wait_ready = mocker.patch(
263+
'xpk.commands.cluster.wait_for_deployment_ready', return_value=True
264+
)
265+
mock_install_cert = mocker.patch(
266+
'xpk.commands.cluster.install_cert_manager', return_value=0
267+
)
268+
mock_download = mocker.patch(
269+
'xpk.commands.cluster.download_mldiagnostics_yaml', return_value=0
270+
)
271+
mock_create_ns = mocker.patch(
272+
'xpk.commands.cluster.create_mldiagnostics_namespace', return_value=0
273+
)
274+
mock_install_yaml = mocker.patch(
275+
'xpk.commands.cluster.install_mldiagnostics_yaml', return_value=0
276+
)
277+
mock_label_ns = mocker.patch(
278+
'xpk.commands.cluster.label_default_namespace_mldiagnostics',
279+
return_value=0,
280+
)
281+
282+
mocker.patch('os.path.exists', return_value=True)
283+
mocker.patch('os.remove')
256284

257285
install_diagon_prerequisites()
258286

259-
assert mocks.common_print_mock.call_count == 0
287+
mock_wait_ready.assert_any_call('kueue-controller-manager', 'kueue-system')
288+
289+
assert mock_sleep.call_count == 2
290+
mock_sleep.assert_any_call(30)
291+
292+
mock_install_cert.assert_called_once()
293+
294+
mock_wait_ready.assert_any_call('cert-manager-webhook', 'cert-manager')
295+
296+
assert mock_download.call_count == 2
297+
mock_download.assert_any_call(
298+
package_name='mldiagnostics-injection-webhook', version='v0.3.0'
299+
)
300+
mock_download.assert_any_call(
301+
package_name='mldiagnostics-connection-operator', version='v0.3.0'
302+
)
303+
304+
mock_create_ns.assert_called_once()
305+
306+
assert mock_install_yaml.call_count == 2
307+
308+
mock_label_ns.assert_called_once()

0 commit comments

Comments
 (0)