Skip to content

Commit dd88d00

Browse files
averseyaversey
committed
Fix mocking in test_resources
1 parent b320566 commit dd88d00

File tree

1 file changed

+25
-25
lines changed

1 file changed

+25
-25
lines changed

‎python/tests/test_resources.py

+25-25
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,7 @@ def test_get_default_resource_limits_no_hard_limit_and_lower_than_default(
384384
resources.ComponentResources._get_default_resource_limits
385385
)
386386
mock_get_serving_res_limits = mocker.patch(
387-
"hsml.client.get_serving_resource_limits",
387+
"hopsworks_common.client.get_serving_resource_limits",
388388
return_value=no_limit_res, # no upper limit
389389
)
390390

@@ -408,7 +408,7 @@ def test_get_default_resource_limits_no_hard_limit_and_higher_than_default(
408408
resources.ComponentResources._get_default_resource_limits
409409
)
410410
mock_get_serving_res_limits = mocker.patch(
411-
"hsml.client.get_serving_resource_limits",
411+
"hopsworks_common.client.get_serving_resource_limits",
412412
return_value=no_limit_res, # no upper limit
413413
)
414414

@@ -432,7 +432,7 @@ def test_get_default_resource_limits_with_higher_hard_limit_and_lower_than_defau
432432
resources.ComponentResources._get_default_resource_limits
433433
)
434434
mock_get_serving_res_limits = mocker.patch(
435-
"hsml.client.get_serving_resource_limits",
435+
"hopsworks_common.client.get_serving_resource_limits",
436436
return_value=hard_limit_res, # upper limit
437437
)
438438

@@ -456,7 +456,7 @@ def test_get_default_resource_limits_with_higher_hard_limit_and_higher_than_defa
456456
resources.ComponentResources._get_default_resource_limits
457457
)
458458
mock_get_serving_res_limits = mocker.patch(
459-
"hsml.client.get_serving_resource_limits",
459+
"hopsworks_common.client.get_serving_resource_limits",
460460
return_value=hard_limit_res, # upper limit
461461
)
462462

@@ -481,7 +481,7 @@ def test_get_default_resource_limits_with_lower_hard_limit_and_lower_than_defaul
481481
resources.ComponentResources._get_default_resource_limits
482482
)
483483
mock_get_serving_res_limits = mocker.patch(
484-
"hsml.client.get_serving_resource_limits",
484+
"hopsworks_common.client.get_serving_resource_limits",
485485
return_value=hard_limit_res, # upper limit
486486
)
487487

@@ -506,7 +506,7 @@ def test_get_default_resource_limits_with_lower_hard_limit_and_higher_than_defau
506506
resources.ComponentResources._get_default_resource_limits
507507
)
508508
mock_get_serving_res_limits = mocker.patch(
509-
"hsml.client.get_serving_resource_limits",
509+
"hopsworks_common.client.get_serving_resource_limits",
510510
return_value=hard_limit_res, # upper limit
511511
)
512512

@@ -527,7 +527,7 @@ def test_validate_resources_no_hard_limits_valid_resources(self, mocker):
527527
requests = resources.Resources(cores=1, memory=1024, gpus=0)
528528
limits = resources.Resources(cores=2, memory=2048, gpus=1)
529529
mock_get_serving_res_limits = mocker.patch(
530-
"hsml.client.get_serving_resource_limits",
530+
"hopsworks_common.client.get_serving_resource_limits",
531531
return_value=no_limit_res, # upper limit
532532
)
533533

@@ -543,7 +543,7 @@ def test_validate_resources_no_hard_limit_invalid_cores_request(self, mocker):
543543
requests = resources.Resources(cores=0, memory=1024, gpus=0)
544544
limits = resources.Resources(cores=2, memory=2048, gpus=1)
545545
mock_get_serving_res_limits = mocker.patch(
546-
"hsml.client.get_serving_resource_limits",
546+
"hopsworks_common.client.get_serving_resource_limits",
547547
return_value=no_limit_res, # upper limit
548548
)
549549

@@ -563,7 +563,7 @@ def test_validate_resources_no_hard_limit_invalid_memory_request(self, mocker):
563563
requests = resources.Resources(cores=1, memory=0, gpus=0)
564564
limits = resources.Resources(cores=2, memory=2048, gpus=1)
565565
mock_get_serving_res_limits = mocker.patch(
566-
"hsml.client.get_serving_resource_limits",
566+
"hopsworks_common.client.get_serving_resource_limits",
567567
return_value=no_limit_res, # upper limit
568568
)
569569

@@ -585,7 +585,7 @@ def test_validate_resources_no_hard_limit_invalid_gpus_request(self, mocker):
585585
) # 0 gpus is accepted
586586
limits = resources.Resources(cores=2, memory=2048, gpus=1)
587587
mock_get_serving_res_limits = mocker.patch(
588-
"hsml.client.get_serving_resource_limits",
588+
"hopsworks_common.client.get_serving_resource_limits",
589589
return_value=no_limit_res, # upper limit
590590
)
591591

@@ -606,7 +606,7 @@ def test_validate_resources_no_hard_limit_cores_request_out_of_range(self, mocke
606606
requests = resources.Resources(cores=2, memory=1024, gpus=0)
607607
limits = resources.Resources(cores=1, memory=2048, gpus=1)
608608
mock_get_serving_res_limits = mocker.patch(
609-
"hsml.client.get_serving_resource_limits",
609+
"hopsworks_common.client.get_serving_resource_limits",
610610
return_value=no_limit_res, # upper limit
611611
)
612612

@@ -629,7 +629,7 @@ def test_validate_resources_no_hard_limit_invalid_memory_request_out_of_range(
629629
requests = resources.Resources(cores=1, memory=2048, gpus=0)
630630
limits = resources.Resources(cores=2, memory=1024, gpus=1)
631631
mock_get_serving_res_limits = mocker.patch(
632-
"hsml.client.get_serving_resource_limits",
632+
"hopsworks_common.client.get_serving_resource_limits",
633633
return_value=no_limit_res, # upper limit
634634
)
635635

@@ -652,7 +652,7 @@ def test_validate_resources_no_hard_limit_invalid_gpus_request_out_of_range(
652652
requests = resources.Resources(cores=1, memory=1024, gpus=2)
653653
limits = resources.Resources(cores=2, memory=2048, gpus=1)
654654
mock_get_serving_res_limits = mocker.patch(
655-
"hsml.client.get_serving_resource_limits",
655+
"hopsworks_common.client.get_serving_resource_limits",
656656
return_value=no_limit_res, # upper limit
657657
)
658658

@@ -673,7 +673,7 @@ def test_validate_resources_with_hard_limit_valid_resources(self, mocker):
673673
requests = resources.Resources(cores=1, memory=1024, gpus=0)
674674
limits = resources.Resources(cores=2, memory=2048, gpus=1)
675675
mock_get_serving_res_limits = mocker.patch(
676-
"hsml.client.get_serving_resource_limits",
676+
"hopsworks_common.client.get_serving_resource_limits",
677677
return_value=hard_limit_res, # upper limit
678678
)
679679

@@ -689,7 +689,7 @@ def test_validate_resources_with_hard_limit_invalid_cores_limit(self, mocker):
689689
requests = resources.Resources(cores=2, memory=1024, gpus=0)
690690
limits = resources.Resources(cores=0, memory=2048, gpus=1)
691691
mock_get_serving_res_limits = mocker.patch(
692-
"hsml.client.get_serving_resource_limits",
692+
"hopsworks_common.client.get_serving_resource_limits",
693693
return_value=hard_limit_res, # upper limit
694694
)
695695

@@ -709,7 +709,7 @@ def test_validate_resources_with_hard_limit_invalid_memory_limit(self, mocker):
709709
requests = resources.Resources(cores=2, memory=1024, gpus=0)
710710
limits = resources.Resources(cores=1, memory=0, gpus=1)
711711
mock_get_serving_res_limits = mocker.patch(
712-
"hsml.client.get_serving_resource_limits",
712+
"hopsworks_common.client.get_serving_resource_limits",
713713
return_value=hard_limit_res, # upper limit
714714
)
715715

@@ -727,7 +727,7 @@ def test_validate_resources_with_hard_limit_invalid_gpus_limit(self, mocker):
727727
requests = resources.Resources(cores=2, memory=1024, gpus=0)
728728
limits = resources.Resources(cores=1, memory=2048, gpus=-1)
729729
mock_get_serving_res_limits = mocker.patch(
730-
"hsml.client.get_serving_resource_limits",
730+
"hopsworks_common.client.get_serving_resource_limits",
731731
return_value=hard_limit_res, # upper limit
732732
)
733733

@@ -747,7 +747,7 @@ def test_validate_resources_with_hard_limit_invalid_cores_request(self, mocker):
747747
requests = resources.Resources(cores=2, memory=1024, gpus=0)
748748
limits = resources.Resources(cores=4, memory=2048, gpus=1)
749749
mock_get_serving_res_limits = mocker.patch(
750-
"hsml.client.get_serving_resource_limits",
750+
"hopsworks_common.client.get_serving_resource_limits",
751751
return_value=hard_limit_res, # upper limit
752752
)
753753

@@ -768,7 +768,7 @@ def test_validate_resources_with_hard_limit_invalid_memory_request(self, mocker)
768768
requests = resources.Resources(cores=2, memory=1024, gpus=0)
769769
limits = resources.Resources(cores=3, memory=4076, gpus=1)
770770
mock_get_serving_res_limits = mocker.patch(
771-
"hsml.client.get_serving_resource_limits",
771+
"hopsworks_common.client.get_serving_resource_limits",
772772
return_value=hard_limit_res, # upper limit
773773
)
774774

@@ -789,7 +789,7 @@ def test_validate_resources_with_hard_limit_invalid_gpus_request(self, mocker):
789789
requests = resources.Resources(cores=2, memory=1024, gpus=0)
790790
limits = resources.Resources(cores=3, memory=2048, gpus=4)
791791
mock_get_serving_res_limits = mocker.patch(
792-
"hsml.client.get_serving_resource_limits",
792+
"hopsworks_common.client.get_serving_resource_limits",
793793
return_value=hard_limit_res, # upper limit
794794
)
795795

@@ -808,7 +808,7 @@ def test_validate_resources_with_hard_limit_invalid_gpus_request(self, mocker):
808808

809809
def test_from_response_json_predictor_resources(self, mocker, backend_fixtures):
810810
mocker.patch(
811-
"hsml.client.get_serving_resource_limits",
811+
"hopsworks_common.client.get_serving_resource_limits",
812812
return_value=SERVING_RESOURCE_LIMITS,
813813
)
814814
json = backend_fixtures["resources"][
@@ -831,7 +831,7 @@ def test_from_response_json_predictor_resources_specific_keys(
831831
self, mocker, backend_fixtures
832832
):
833833
mocker.patch(
834-
"hsml.client.get_serving_resource_limits",
834+
"hopsworks_common.client.get_serving_resource_limits",
835835
return_value=SERVING_RESOURCE_LIMITS,
836836
)
837837
json = backend_fixtures["resources"][
@@ -854,7 +854,7 @@ def test_from_response_json_predictor_resources_specific_keys(
854854

855855
def test_from_response_json_transformer_resources(self, mocker, backend_fixtures):
856856
mocker.patch(
857-
"hsml.client.get_serving_resource_limits",
857+
"hopsworks_common.client.get_serving_resource_limits",
858858
return_value=SERVING_RESOURCE_LIMITS,
859859
)
860860
json = backend_fixtures["resources"][
@@ -877,7 +877,7 @@ def test_from_response_json_transformer_resources_specific_keys(
877877
self, mocker, backend_fixtures
878878
):
879879
mocker.patch(
880-
"hsml.client.get_serving_resource_limits",
880+
"hopsworks_common.client.get_serving_resource_limits",
881881
return_value=SERVING_RESOURCE_LIMITS,
882882
)
883883
json = backend_fixtures["resources"][
@@ -900,7 +900,7 @@ def test_from_response_json_transformer_resources_default_limits(
900900
self, mocker, backend_fixtures
901901
):
902902
mocker.patch(
903-
"hsml.client.get_serving_resource_limits",
903+
"hopsworks_common.client.get_serving_resource_limits",
904904
return_value=SERVING_RESOURCE_LIMITS,
905905
)
906906
mocker.patch(

0 commit comments

Comments
 (0)