Skip to content

Commit 097a9db

Browse files
committed
Fixed unit tests
1 parent 2f5dd9f commit 097a9db

File tree

1 file changed

+48
-3
lines changed

1 file changed

+48
-3
lines changed

Diff for: tests/unit_test.py

+48-3
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,28 @@ def test_config_creation():
260260
assert config.local_interactive == False
261261

262262

263+
def sample_no_routes():
264+
api_versions = client.V1APIGroupList(
265+
api_version="v1",
266+
groups=[
267+
{
268+
"name": "route.openshift.io",
269+
"preferred_version": {
270+
"group_version": "route.openshift.io/v1",
271+
"version": "v1",
272+
},
273+
"versions": [
274+
{"group_version": "route.openshift.io/v1", "version": "v1"}
275+
],
276+
}
277+
],
278+
)
279+
280+
return api_versions
281+
282+
263283
def test_cluster_creation(mocker):
284+
mocker.patch("kubernetes.client.ApisApi.get_api_versions")
264285
cluster = createClusterWithConfig(mocker)
265286
assert cluster.app_wrapper_yaml == f"{aw_dir}unit-test-cluster.yaml"
266287
assert cluster.app_wrapper_name == "unit-test-cluster"
@@ -285,6 +306,7 @@ def test_create_app_wrapper_raises_error_with_no_image():
285306

286307

287308
def test_cluster_creation_no_mcad(mocker):
309+
mocker.patch("kubernetes.client.ApisApi.get_api_versions")
288310
mocker.patch(
289311
"kubernetes.client.CustomObjectsApi.get_cluster_custom_object",
290312
return_value={"spec": {"domain": "apps.cluster.awsroute.org"}},
@@ -303,6 +325,7 @@ def test_cluster_creation_no_mcad(mocker):
303325

304326

305327
def test_cluster_creation_priority(mocker):
328+
mocker.patch("kubernetes.client.ApisApi.get_api_versions")
306329
mocker.patch("kubernetes.config.load_kube_config", return_value="ignore")
307330
mocker.patch(
308331
"kubernetes.client.CustomObjectsApi.list_cluster_custom_object",
@@ -326,6 +349,7 @@ def test_cluster_creation_priority(mocker):
326349

327350

328351
def test_default_cluster_creation(mocker):
352+
mocker.patch("kubernetes.client.ApisApi.get_api_versions")
329353
mocker.patch(
330354
"codeflare_sdk.cluster.cluster.get_current_namespace",
331355
return_value="opendatahub",
@@ -408,6 +432,7 @@ def arg_check_del_effect(group, version, namespace, plural, name, *args):
408432

409433

410434
def test_cluster_up_down(mocker):
435+
mocker.patch("kubernetes.client.ApisApi.get_api_versions")
411436
mocker.patch("kubernetes.config.load_kube_config", return_value="ignore")
412437
mocker.patch(
413438
"kubernetes.client.CustomObjectsApi.get_cluster_custom_object",
@@ -431,6 +456,7 @@ def test_cluster_up_down(mocker):
431456

432457

433458
def test_cluster_up_down_no_mcad(mocker):
459+
mocker.patch("kubernetes.client.ApisApi.get_api_versions")
434460
mocker.patch("kubernetes.config.load_kube_config", return_value="ignore")
435461
mocker.patch(
436462
"kubernetes.client.CustomObjectsApi.get_cluster_custom_object",
@@ -537,6 +563,7 @@ def test_delete_openshift_oauth_objects(mocker):
537563

538564

539565
def test_cluster_uris(mocker):
566+
mocker.patch("kubernetes.client.ApisApi.get_api_versions")
540567
mocker.patch("kubernetes.config.load_kube_config", return_value="ignore")
541568
mocker.patch(
542569
"codeflare_sdk.cluster.cluster._get_ingress_domain",
@@ -636,6 +663,7 @@ def ingress_retrieval(port, annotations=None):
636663

637664

638665
def test_ray_job_wrapping(mocker):
666+
mocker.patch("kubernetes.client.ApisApi.get_api_versions")
639667
cluster = cluster = createClusterWithConfig(mocker)
640668
cluster.config.image = "quay.io/project-codeflare/ray:latest-py39-cu118"
641669
mocker.patch(
@@ -730,6 +758,7 @@ def test_print_appwrappers(capsys):
730758

731759

732760
def test_ray_details(mocker, capsys):
761+
mocker.patch("kubernetes.client.ApisApi.get_api_versions")
733762
ray1 = RayCluster(
734763
name="raytest1",
735764
status=RayClusterStatus.READY,
@@ -1796,6 +1825,7 @@ def get_aw_obj(group, version, namespace, plural):
17961825

17971826

17981827
def test_get_cluster(mocker):
1828+
mocker.patch("kubernetes.client.ApisApi.get_api_versions")
17991829
mocker.patch("kubernetes.config.load_kube_config", return_value="ignore")
18001830
mocker.patch(
18011831
"kubernetes.client.CustomObjectsApi.list_namespaced_custom_object",
@@ -1904,6 +1934,7 @@ def test_list_queue(mocker, capsys):
19041934

19051935

19061936
def test_cluster_status(mocker):
1937+
mocker.patch("kubernetes.client.ApisApi.get_api_versions")
19071938
mocker.patch("kubernetes.config.load_kube_config", return_value="ignore")
19081939
fake_aw = AppWrapper(
19091940
"test", AppWrapperStatus.FAILED, can_run=True, job_state="unused"
@@ -1993,6 +2024,7 @@ def test_cluster_status(mocker):
19932024

19942025

19952026
def test_wait_ready(mocker, capsys):
2027+
mocker.patch("kubernetes.client.ApisApi.get_api_versions")
19962028
mocker.patch(
19972029
"kubernetes.client.NetworkingV1Api.list_namespaced_ingress",
19982030
return_value=ingress_retrieval(8265),
@@ -2053,6 +2085,7 @@ def test_wait_ready(mocker, capsys):
20532085

20542086

20552087
def test_jobdefinition_coverage(mocker):
2088+
mocker.patch("kubernetes.client.ApisApi.get_api_versions")
20562089
mocker.patch(
20572090
"kubernetes.client.CustomObjectsApi.get_cluster_custom_object",
20582091
return_value={"spec": {"domain": ""}},
@@ -2069,7 +2102,8 @@ def test_job_coverage():
20692102
abstract.logs()
20702103

20712104

2072-
def test_DDPJobDefinition_creation():
2105+
def test_DDPJobDefinition_creation(mocker):
2106+
mocker.patch("kubernetes.client.ApisApi.get_api_versions")
20732107
ddp = createTestDDP()
20742108
assert ddp.script == "test.py"
20752109
assert ddp.m == None
@@ -2093,6 +2127,7 @@ def test_DDPJobDefinition_dry_run(mocker: MockerFixture):
20932127
that the attributes of the returned object are of the correct type,
20942128
and that the values from cluster and job definition are correctly passed.
20952129
"""
2130+
mocker.patch("kubernetes.client.ApisApi.get_api_versions")
20962131
mocker.patch("kubernetes.config.load_kube_config", return_value="ignore")
20972132
mocker.patch(
20982133
"codeflare_sdk.cluster.cluster.Cluster.cluster_dashboard_uri",
@@ -2129,7 +2164,7 @@ def test_DDPJobDefinition_dry_run_no_cluster(mocker):
21292164
that the attributes of the returned object are of the correct type,
21302165
and that the values from cluster and job definition are correctly passed.
21312166
"""
2132-
2167+
mocker.patch("kubernetes.client.ApisApi.get_api_versions")
21332168
mocker.patch(
21342169
"codeflare_sdk.job.jobs.get_current_namespace",
21352170
return_value="opendatahub",
@@ -2168,6 +2203,7 @@ def test_DDPJobDefinition_dry_run_no_resource_args(mocker):
21682203
Test that the dry run correctly gets resources from the cluster object
21692204
when the job definition does not specify resources.
21702205
"""
2206+
mocker.patch("kubernetes.client.ApisApi.get_api_versions")
21712207
mocker.patch.object(Cluster, "job_client")
21722208
mocker.patch(
21732209
"kubernetes.client.CustomObjectsApi.get_cluster_custom_object",
@@ -2207,6 +2243,7 @@ def test_DDPJobDefinition_dry_run_no_cluster_no_resource_args(mocker):
22072243
that the attributes of the returned object are of the correct type,
22082244
and that the values from cluster and job definition are correctly passed.
22092245
"""
2246+
mocker.patch("kubernetes.client.ApisApi.get_api_versions")
22102247

22112248
mocker.patch(
22122249
"codeflare_sdk.job.jobs.get_current_namespace",
@@ -2261,6 +2298,7 @@ def test_DDPJobDefinition_submit(mocker: MockerFixture):
22612298
Tests that the submit method returns the correct type: DDPJob
22622299
And that the attributes of the returned object are of the correct type
22632300
"""
2301+
mocker.patch("kubernetes.client.ApisApi.get_api_versions")
22642302
mock_schedule = MagicMock()
22652303
mocker.patch.object(Runner, "schedule", mock_schedule)
22662304
mock_schedule.return_value = "fake-dashboard-url"
@@ -2291,6 +2329,7 @@ def test_DDPJobDefinition_submit(mocker: MockerFixture):
22912329

22922330

22932331
def test_DDPJob_creation(mocker: MockerFixture):
2332+
mocker.patch("kubernetes.client.ApisApi.get_api_versions")
22942333
mocker.patch.object(Cluster, "job_client")
22952334
mock_schedule = MagicMock()
22962335
mocker.patch.object(Runner, "schedule", mock_schedule)
@@ -2316,6 +2355,7 @@ def test_DDPJob_creation(mocker: MockerFixture):
23162355

23172356

23182357
def test_DDPJob_creation_no_cluster(mocker: MockerFixture):
2358+
mocker.patch("kubernetes.client.ApisApi.get_api_versions")
23192359
ddp_def = createTestDDP()
23202360
ddp_def.image = "fake-image"
23212361
mocker.patch(
@@ -2341,6 +2381,7 @@ def test_DDPJob_creation_no_cluster(mocker: MockerFixture):
23412381

23422382

23432383
def test_DDPJob_status(mocker: MockerFixture):
2384+
mocker.patch("kubernetes.client.ApisApi.get_api_versions")
23442385
# Setup the neccesary mock patches
23452386
mock_status = MagicMock()
23462387
mocker.patch.object(Runner, "status", mock_status)
@@ -2355,6 +2396,7 @@ def test_DDPJob_status(mocker: MockerFixture):
23552396

23562397

23572398
def test_DDPJob_logs(mocker: MockerFixture):
2399+
mocker.patch("kubernetes.client.ApisApi.get_api_versions")
23582400
mock_log = MagicMock()
23592401
mocker.patch.object(Runner, "log_lines", mock_log)
23602402
# Setup the neccesary mock patches
@@ -2401,7 +2443,8 @@ def parse_j(cmd):
24012443
return f"{worker}x{gpu}"
24022444

24032445

2404-
def test_AWManager_creation():
2446+
def test_AWManager_creation(mocker):
2447+
mocker.patch("kubernetes.client.ApisApi.get_api_versions")
24052448
testaw = AWManager(f"{aw_dir}test.yaml")
24062449
assert testaw.name == "test"
24072450
assert testaw.namespace == "ns"
@@ -2442,6 +2485,7 @@ def arg_check_aw_del_effect(group, version, namespace, plural, name, *args):
24422485

24432486

24442487
def test_AWManager_submit_remove(mocker, capsys):
2488+
mocker.patch("kubernetes.client.ApisApi.get_api_versions")
24452489
testaw = AWManager(f"{aw_dir}test.yaml")
24462490
testaw.remove()
24472491
captured = capsys.readouterr()
@@ -2822,6 +2866,7 @@ def test_replace_openshift_oauth(mocker: MockerFixture):
28222866

28232867

28242868
def test_gen_app_wrapper_with_oauth(mocker: MockerFixture):
2869+
mocker.patch("kubernetes.client.ApisApi.get_api_versions")
28252870
mocker.patch(
28262871
"codeflare_sdk.utils.generate_yaml._get_api_host", return_value="foo.com"
28272872
)

0 commit comments

Comments
 (0)