Skip to content

Commit ff10371

Browse files
Bobbins228astefanutti
authored andcommitted
Fixed unit tests
1 parent d9de5a3 commit ff10371

File tree

1 file changed

+48
-3
lines changed

1 file changed

+48
-3
lines changed

tests/unit_test.py

Lines changed: 48 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,28 @@ def test_config_creation():
261261
assert config.local_interactive == False
262262

263263

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

287308

288309
def test_cluster_creation_no_mcad(mocker):
310+
mocker.patch("kubernetes.client.ApisApi.get_api_versions")
289311
mocker.patch(
290312
"kubernetes.client.CustomObjectsApi.get_cluster_custom_object",
291313
return_value={"spec": {"domain": "apps.cluster.awsroute.org"}},
@@ -304,6 +326,7 @@ def test_cluster_creation_no_mcad(mocker):
304326

305327

306328
def test_cluster_creation_priority(mocker):
329+
mocker.patch("kubernetes.client.ApisApi.get_api_versions")
307330
mocker.patch("kubernetes.config.load_kube_config", return_value="ignore")
308331
mocker.patch(
309332
"kubernetes.client.CustomObjectsApi.list_cluster_custom_object",
@@ -327,6 +350,7 @@ def test_cluster_creation_priority(mocker):
327350

328351

329352
def test_default_cluster_creation(mocker):
353+
mocker.patch("kubernetes.client.ApisApi.get_api_versions")
330354
mocker.patch(
331355
"codeflare_sdk.cluster.cluster.get_current_namespace",
332356
return_value="opendatahub",
@@ -409,6 +433,7 @@ def arg_check_del_effect(group, version, namespace, plural, name, *args):
409433

410434

411435
def test_cluster_up_down(mocker):
436+
mocker.patch("kubernetes.client.ApisApi.get_api_versions")
412437
mocker.patch("kubernetes.config.load_kube_config", return_value="ignore")
413438
mocker.patch(
414439
"kubernetes.client.CustomObjectsApi.get_cluster_custom_object",
@@ -432,6 +457,7 @@ def test_cluster_up_down(mocker):
432457

433458

434459
def test_cluster_up_down_no_mcad(mocker):
460+
mocker.patch("kubernetes.client.ApisApi.get_api_versions")
435461
mocker.patch("kubernetes.config.load_kube_config", return_value="ignore")
436462
mocker.patch(
437463
"kubernetes.client.CustomObjectsApi.get_cluster_custom_object",
@@ -538,6 +564,7 @@ def test_delete_openshift_oauth_objects(mocker):
538564

539565

540566
def test_cluster_uris(mocker):
567+
mocker.patch("kubernetes.client.ApisApi.get_api_versions")
541568
mocker.patch("kubernetes.config.load_kube_config", return_value="ignore")
542569
mocker.patch(
543570
"codeflare_sdk.cluster.cluster._get_ingress_domain",
@@ -637,6 +664,7 @@ def ingress_retrieval(port, annotations=None):
637664

638665

639666
def test_ray_job_wrapping(mocker):
667+
mocker.patch("kubernetes.client.ApisApi.get_api_versions")
640668
cluster = cluster = createClusterWithConfig(mocker)
641669
cluster.config.image = "quay.io/project-codeflare/ray:latest-py39-cu118"
642670
mocker.patch(
@@ -731,6 +759,7 @@ def test_print_appwrappers(capsys):
731759

732760

733761
def test_ray_details(mocker, capsys):
762+
mocker.patch("kubernetes.client.ApisApi.get_api_versions")
734763
ray1 = RayCluster(
735764
name="raytest1",
736765
status=RayClusterStatus.READY,
@@ -1764,6 +1793,7 @@ def get_aw_obj(group, version, namespace, plural):
17641793

17651794

17661795
def test_get_cluster(mocker):
1796+
mocker.patch("kubernetes.client.ApisApi.get_api_versions")
17671797
mocker.patch("kubernetes.config.load_kube_config", return_value="ignore")
17681798
mocker.patch(
17691799
"kubernetes.client.CustomObjectsApi.list_namespaced_custom_object",
@@ -1872,6 +1902,7 @@ def test_list_queue(mocker, capsys):
18721902

18731903

18741904
def test_cluster_status(mocker):
1905+
mocker.patch("kubernetes.client.ApisApi.get_api_versions")
18751906
mocker.patch("kubernetes.config.load_kube_config", return_value="ignore")
18761907
fake_aw = AppWrapper(
18771908
"test", AppWrapperStatus.FAILED, can_run=True, job_state="unused"
@@ -1961,6 +1992,7 @@ def test_cluster_status(mocker):
19611992

19621993

19631994
def test_wait_ready(mocker, capsys):
1995+
mocker.patch("kubernetes.client.ApisApi.get_api_versions")
19641996
mocker.patch(
19651997
"kubernetes.client.NetworkingV1Api.list_namespaced_ingress",
19661998
return_value=ingress_retrieval(8265),
@@ -2021,6 +2053,7 @@ def test_wait_ready(mocker, capsys):
20212053

20222054

20232055
def test_jobdefinition_coverage(mocker):
2056+
mocker.patch("kubernetes.client.ApisApi.get_api_versions")
20242057
mocker.patch(
20252058
"kubernetes.client.CustomObjectsApi.get_cluster_custom_object",
20262059
return_value={"spec": {"domain": ""}},
@@ -2037,7 +2070,8 @@ def test_job_coverage():
20372070
abstract.logs()
20382071

20392072

2040-
def test_DDPJobDefinition_creation():
2073+
def test_DDPJobDefinition_creation(mocker):
2074+
mocker.patch("kubernetes.client.ApisApi.get_api_versions")
20412075
ddp = createTestDDP()
20422076
assert ddp.script == "test.py"
20432077
assert ddp.m == None
@@ -2061,6 +2095,7 @@ def test_DDPJobDefinition_dry_run(mocker: MockerFixture):
20612095
that the attributes of the returned object are of the correct type,
20622096
and that the values from cluster and job definition are correctly passed.
20632097
"""
2098+
mocker.patch("kubernetes.client.ApisApi.get_api_versions")
20642099
mocker.patch("kubernetes.config.load_kube_config", return_value="ignore")
20652100
mocker.patch(
20662101
"codeflare_sdk.cluster.cluster.Cluster.cluster_dashboard_uri",
@@ -2097,7 +2132,7 @@ def test_DDPJobDefinition_dry_run_no_cluster(mocker):
20972132
that the attributes of the returned object are of the correct type,
20982133
and that the values from cluster and job definition are correctly passed.
20992134
"""
2100-
2135+
mocker.patch("kubernetes.client.ApisApi.get_api_versions")
21012136
mocker.patch(
21022137
"codeflare_sdk.job.jobs.get_current_namespace",
21032138
return_value="opendatahub",
@@ -2136,6 +2171,7 @@ def test_DDPJobDefinition_dry_run_no_resource_args(mocker):
21362171
Test that the dry run correctly gets resources from the cluster object
21372172
when the job definition does not specify resources.
21382173
"""
2174+
mocker.patch("kubernetes.client.ApisApi.get_api_versions")
21392175
mocker.patch.object(Cluster, "job_client")
21402176
mocker.patch(
21412177
"kubernetes.client.CustomObjectsApi.get_cluster_custom_object",
@@ -2175,6 +2211,7 @@ def test_DDPJobDefinition_dry_run_no_cluster_no_resource_args(mocker):
21752211
that the attributes of the returned object are of the correct type,
21762212
and that the values from cluster and job definition are correctly passed.
21772213
"""
2214+
mocker.patch("kubernetes.client.ApisApi.get_api_versions")
21782215

21792216
mocker.patch(
21802217
"codeflare_sdk.job.jobs.get_current_namespace",
@@ -2229,6 +2266,7 @@ def test_DDPJobDefinition_submit(mocker: MockerFixture):
22292266
Tests that the submit method returns the correct type: DDPJob
22302267
And that the attributes of the returned object are of the correct type
22312268
"""
2269+
mocker.patch("kubernetes.client.ApisApi.get_api_versions")
22322270
mock_schedule = MagicMock()
22332271
mocker.patch.object(Runner, "schedule", mock_schedule)
22342272
mock_schedule.return_value = "fake-dashboard-url"
@@ -2259,6 +2297,7 @@ def test_DDPJobDefinition_submit(mocker: MockerFixture):
22592297

22602298

22612299
def test_DDPJob_creation(mocker: MockerFixture):
2300+
mocker.patch("kubernetes.client.ApisApi.get_api_versions")
22622301
mocker.patch.object(Cluster, "job_client")
22632302
mock_schedule = MagicMock()
22642303
mocker.patch.object(Runner, "schedule", mock_schedule)
@@ -2284,6 +2323,7 @@ def test_DDPJob_creation(mocker: MockerFixture):
22842323

22852324

22862325
def test_DDPJob_creation_no_cluster(mocker: MockerFixture):
2326+
mocker.patch("kubernetes.client.ApisApi.get_api_versions")
22872327
ddp_def = createTestDDP()
22882328
ddp_def.image = "fake-image"
22892329
mocker.patch(
@@ -2309,6 +2349,7 @@ def test_DDPJob_creation_no_cluster(mocker: MockerFixture):
23092349

23102350

23112351
def test_DDPJob_status(mocker: MockerFixture):
2352+
mocker.patch("kubernetes.client.ApisApi.get_api_versions")
23122353
# Setup the neccesary mock patches
23132354
mock_status = MagicMock()
23142355
mocker.patch.object(Runner, "status", mock_status)
@@ -2323,6 +2364,7 @@ def test_DDPJob_status(mocker: MockerFixture):
23232364

23242365

23252366
def test_DDPJob_logs(mocker: MockerFixture):
2367+
mocker.patch("kubernetes.client.ApisApi.get_api_versions")
23262368
mock_log = MagicMock()
23272369
mocker.patch.object(Runner, "log_lines", mock_log)
23282370
# Setup the neccesary mock patches
@@ -2369,7 +2411,8 @@ def parse_j(cmd):
23692411
return f"{worker}x{gpu}"
23702412

23712413

2372-
def test_AWManager_creation():
2414+
def test_AWManager_creation(mocker):
2415+
mocker.patch("kubernetes.client.ApisApi.get_api_versions")
23732416
testaw = AWManager(f"{aw_dir}test.yaml")
23742417
assert testaw.name == "test"
23752418
assert testaw.namespace == "ns"
@@ -2410,6 +2453,7 @@ def arg_check_aw_del_effect(group, version, namespace, plural, name, *args):
24102453

24112454

24122455
def test_AWManager_submit_remove(mocker, capsys):
2456+
mocker.patch("kubernetes.client.ApisApi.get_api_versions")
24132457
testaw = AWManager(f"{aw_dir}test.yaml")
24142458
testaw.remove()
24152459
captured = capsys.readouterr()
@@ -2790,6 +2834,7 @@ def test_replace_openshift_oauth(mocker: MockerFixture):
27902834

27912835

27922836
def test_gen_app_wrapper_with_oauth(mocker: MockerFixture):
2837+
mocker.patch("kubernetes.client.ApisApi.get_api_versions")
27932838
mocker.patch(
27942839
"codeflare_sdk.utils.generate_yaml._get_api_host", return_value="foo.com"
27952840
)

0 commit comments

Comments
 (0)